Index: openacs-4/packages/calendar-includelet/calendar-includelet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/calendar-includelet.info,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/calendar-includelet.info	30 Jul 2008 11:50:20 -0000	1.1
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!-- Generated by the OpenACS Package Manager -->
+
+<package key="calendar-includelet" url="http://openacs.org/repository/apm/packages/calendar-includelet" type="apm_service">
+    <package-name>Calendar Includelet</package-name>
+    <pretty-plural>Calendar Includelets</pretty-plural>
+    <initial-install-p>f</initial-install-p>
+    <singleton-p>t</singleton-p>
+
+    <version name="2.2" url="http://openacs.org/repository/download/apm/calendar-includelet-2.2.apm">
+        <owner url="http://openacs.org">OpenACS</owner>
+        <release-date>2004-03-10</release-date>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+
+        <provides url="calendar-includelet" version="1.0"/>
+        <requires url="calendar" version="1.0"/>
+        <requires url="layout-manager" version="1.0"/>
+
+        <callbacks>
+            <callback type="after-install"  proc="calendar_includelet::install::package_install"/>
+            <callback type="before-uninstall"  proc="calendar_includelet::install::package_uninstall"/>
+        </callbacks>
+
+        <parameters>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="pretty_name"  default="#calendar-includelet.pretty_name#" description="Pretty Name"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="full_includelet_pretty_name"  default="#calendar-includelet.full_includelet_pretty_name#" description="Description of Full Calendar Pretty Name"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="force_region"  default="2" description="the portal region to add the calendar includelet"/>
+        </parameters>
+
+    </version>
+</package>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.AR_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.AR_EG.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.AR_EG.utf-8.xml	30 Jul 2008 11:50:20 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="AR_EG" charset="utf-8">
+
+  <msg key="Add_an_item">أضف بندًا</msg>
+  <msg key="admin_pretty_name">إدارة المفكرة</msg>
+  <msg key="Create_a_new_Event">أخلق حدثًا جديدًا</msg>
+  <msg key="full_includelet_pretty_name">المُفَكِّرَة الكاملة</msg>
+  <msg key="lt_Manage_Calendar_Event">أدرْ أنواعَ الحدثِ التقويميةِ</msg>
+  <msg key="Manage_Item_Types">أدرْ أنواعَ المادةِ</msg>
+  <msg key="pretty_name">المُفَكِّرَة</msg>
+  <msg key="Schedule">الجدول</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.AR_LB.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.AR_LB.utf-8.xml	30 Jul 2008 11:50:20 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="AR_LB" charset="utf-8">
+
+  <msg key="Add_an_item">أضف بنداً</msg>
+  <msg key="admin_pretty_name">إدارة المفكرة</msg>
+  <msg key="Create_a_new_Event">أخلق حدثًا جديداً</msg>
+  <msg key="full_includelet_pretty_name">المُفَكِّرَة الكاملة</msg>
+  <msg key="lt_Manage_Calendar_Event">أدرْ أنواعَ الحدثِ التقويميةِ</msg>
+  <msg key="Manage_Item_Types">أدرْ أنواعَ المادةِ</msg>
+  <msg key="pretty_name">المُفَكِّرَة</msg>
+  <msg key="Schedule">الجَدول</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.FA_IR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.FA_IR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.FA_IR.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="FA_IR" charset="utf-8">
+
+  <msg key="admin_pretty_name">مديريت تقويم</msg>
+  <msg key="pretty_name">تقويم</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.RO_RO.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.RO_RO.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.RO_RO.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="RO_RO" charset="utf-8">
+
+  <msg key="Add_an_item">Adaugă un element</msg>
+  <msg key="admin_pretty_name">Administrare Calendar</msg>
+  <msg key="Create_a_new_Event">Creează un nou Eveniment</msg>
+  <msg key="full_includelet_pretty_name">Calendar Complet</msg>
+  <msg key="lt_Manage_Calendar_Event">Administrează Tipuri de Evenimente în Calendar</msg>
+  <msg key="Manage_Item_Types">Administrează Tipurile de Elemente</msg>
+  <msg key="pretty_name">Calendar</msg>
+  <msg key="Schedule">Orar</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.TH_TH.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.TH_TH.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.TH_TH.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="TH_TH" charset="utf-8">
+
+  <msg key="Add_an_item">เพิ่มรายการ</msg>
+  <msg key="full_includelet_pretty_name">ปฎิทิน</msg>
+  <msg key="Manage_Item_Types">จัดการประเภทของรายการ</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ast_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ast_ES.ISO-8859-1.xml	30 Jul 2008 11:50:20 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="ast_ES" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Axuntar un �tem</msg>
+  <msg key="admin_pretty_name">Alministraci�n del Calandariu</msg>
+  <msg key="Create_a_new_Event">Crear un Eventu nuevu</msg>
+  <msg key="full_includelet_pretty_name">Calandariu Completu</msg>
+  <msg key="lt_Manage_Calendar_Event">Xestionar les Estayes d'Eventos del Calandariu</msg>
+  <msg key="Manage_Item_Types">Xestionar Estayes</msg>
+  <msg key="pretty_name">Calandariu</msg>
+  <msg key="Schedule">Horariu</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ch_zh.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ch_zh.utf-8.xml	30 Jul 2008 11:50:20 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="ch_zh" charset="utf-8">
+
+  <msg key="Add_an_item">增加条目</msg>
+  <msg key="admin_pretty_name">日历管理</msg>
+  <msg key="Create_a_new_Event">创建新事件</msg>
+  <msg key="full_includelet_pretty_name">全部日历</msg>
+  <msg key="lt_Manage_Calendar_Event">设置日历事件类型</msg>
+  <msg key="Manage_Item_Types">设置条目类型</msg>
+  <msg key="pretty_name">日历</msg>
+  <msg key="Schedule">时间表</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.da_DK.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.da_DK.ISO-8859-1.xml	30 Jul 2008 11:50:20 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="da_DK" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Tilf�j en kalenderpost</msg>
+  <msg key="admin_pretty_name">Administation af Kalender</msg>
+  <msg key="Create_a_new_Event">Opret en ny Begivenhed</msg>
+  <msg key="full_includelet_pretty_name">Kalender</msg>
+  <msg key="lt_Manage_Calendar_Event">Administrer typer af kalenderbegivenheder</msg>
+  <msg key="Manage_Item_Types">Administrer kalenderposttyper</msg>
+  <msg key="pretty_name">Kalender</msg>
+  <msg key="Schedule">Skema</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.de_DE.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.de_DE.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="de_DE" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Eintrag hinzuf�gen</msg>
+  <msg key="admin_pretty_name">Kalender verwalten</msg>
+  <msg key="Create_a_new_Event">Neuen Eintrag hinzuf�gen</msg>
+  <msg key="full_includelet_pretty_name">Kalender</msg>
+  <msg key="lt_Manage_Calendar_Event">Eintragskategorien �ndern</msg>
+  <msg key="Manage_Item_Types">Eintragskategorien �ndern</msg>
+  <msg key="pretty_name">Kalender</msg>
+  <msg key="Schedule">Tagesplan</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.en_US.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.en_US.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="en_US" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Add an item</msg>
+  <msg key="admin_pretty_name">Calendar Administration</msg>
+  <msg key="Create_a_new_Event">Create a new Event</msg>
+  <msg key="full_includelet_pretty_name">Full Calendar</msg>
+  <msg key="lt_Manage_Calendar_Event">Manage Calendar Event Types</msg>
+  <msg key="Manage_Item_Types">Manage Item Types</msg>
+  <msg key="pretty_name">Calendar</msg>
+  <msg key="Schedule">Schedule</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.es_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.es_ES.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="es_ES" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">A�adir una cita</msg>
+  <msg key="admin_pretty_name">Administraci�n del Calendario</msg>
+  <msg key="Create_a_new_Event">Crear una Cita nueva</msg>
+  <msg key="full_includelet_pretty_name">Calendario Completo</msg>
+  <msg key="lt_Manage_Calendar_Event">Administrar las categor�as de Citas</msg>
+  <msg key="Manage_Item_Types">Administrar categor�as</msg>
+  <msg key="pretty_name">Calendario</msg>
+  <msg key="Schedule">Planificaci�n</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.fi_FI.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.fi_FI.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="fi_FI" charset="utf-8">
+
+  <msg key="Add_an_item">Lisää tapahtuma</msg>
+  <msg key="admin_pretty_name">Kalenterin ylläpito</msg>
+  <msg key="Create_a_new_Event">Luo uusi tapahtuma</msg>
+  <msg key="full_includelet_pretty_name">Kalenteri</msg>
+  <msg key="lt_Manage_Calendar_Event">Muokkaa tapahtumatyyppejä</msg>
+  <msg key="Manage_Item_Types">Muokkaa tapahtumatyyppejä</msg>
+  <msg key="pretty_name">Päivän ohjelma</msg>
+  <msg key="Schedule">Aikataulu</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.fr_FR.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.fr_FR.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="fr_FR" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Ajouter un �l�ment</msg>
+  <msg key="admin_pretty_name">Administration de l'agenda</msg>
+  <msg key="Create_a_new_Event">Cr�er un nouvel �v�nement</msg>
+  <msg key="full_includelet_pretty_name">Agenda</msg>
+  <msg key="lt_Manage_Calendar_Event">G�rer les types d'�v�nements</msg>
+  <msg key="Manage_Item_Types">G�rer les types d'�l�ments</msg>
+  <msg key="pretty_name">Agenda</msg>
+  <msg key="Schedule">Planification</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.gl_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.gl_ES.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="gl_ES" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Engadir un �tem</msg>
+  <msg key="admin_pretty_name">Administraci�n do Calendario</msg>
+  <msg key="Create_a_new_Event">Crear novo Evento</msg>
+  <msg key="full_includelet_pretty_name">Calendario Completo</msg>
+  <msg key="lt_Manage_Calendar_Event">Xerenciar Tipos de Evento do Calendario</msg>
+  <msg key="Manage_Item_Types">Xerenciar Tipos de �tem</msg>
+  <msg key="pretty_name">Calendario</msg>
+  <msg key="Schedule">Horario</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.hu_HU.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.hu_HU.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="hu_HU" charset="utf-8">
+
+  <msg key="Add_an_item">Új bejegyzés</msg>
+  <msg key="admin_pretty_name">Naptár adminisztrációja</msg>
+  <msg key="Create_a_new_Event">Új esemény</msg>
+  <msg key="full_includelet_pretty_name">Az egész naptár</msg>
+  <msg key="lt_Manage_Calendar_Event">Naptárbejegyzés-típusok</msg>
+  <msg key="Manage_Item_Types">Naptárbejegyzés-típusok</msg>
+  <msg key="pretty_name">Naptár</msg>
+  <msg key="Schedule">Órarend</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.it_IT.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.it_IT.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="it_IT" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Aggiungi un appuntamento</msg>
+  <msg key="admin_pretty_name">Amministrazione del Calendario</msg>
+  <msg key="Create_a_new_Event">Crea un nuovo Evento</msg>
+  <msg key="full_includelet_pretty_name">Calendario Completo</msg>
+  <msg key="lt_Manage_Calendar_Event">Amministra i tipi di evento</msg>
+  <msg key="Manage_Item_Types">Gestisci i Tipi di Appuntamento</msg>
+  <msg key="pretty_name">Calendario</msg>
+  <msg key="Schedule">Pianificazione</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ja_JP.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ja_JP.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="ja_JP" charset="utf-8">
+
+  <msg key="full_includelet_pretty_name">カレンダー全体</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ko_KR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ko_KR.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="ko_KR" charset="utf-8">
+
+  <msg key="Add_an_item">항목 추가</msg>
+  <msg key="admin_pretty_name">달력 관리</msg>
+  <msg key="Create_a_new_Event">새로운 이벤트 생성</msg>
+  <msg key="full_includelet_pretty_name">전체 달력</msg>
+  <msg key="lt_Manage_Calendar_Event">달력 이벤트 유형 관리</msg>
+  <msg key="Manage_Item_Types">항목 유형 관리</msg>
+  <msg key="pretty_name">달력</msg>
+  <msg key="Schedule">스케쥴</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ms_my.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ms_my.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="ms_my" charset="utf-8">
+
+  <msg key="Add_an_item">Tambah suatu butiran</msg>
+  <msg key="admin_pretty_name">Pengendalian Takwim</msg>
+  <msg key="Create_a_new_Event">Reka Peristiwa baru</msg>
+  <msg key="full_includelet_pretty_name">Takwim Lengkap</msg>
+  <msg key="lt_Manage_Calendar_Event">Urus Jenis-jenis Peristiwa Takwim</msg>
+  <msg key="Manage_Item_Types">Urus Jenis Kategori</msg>
+  <msg key="pretty_name">Takwim</msg>
+  <msg key="Schedule">Jadual</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.nl_NL.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.nl_NL.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="nl_NL" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Gebeurtenis toevoegen</msg>
+  <msg key="admin_pretty_name">Kalender administratie</msg>
+  <msg key="Create_a_new_Event">Nieuwe gebeurtenis aanmaken </msg>
+  <msg key="full_includelet_pretty_name">Complete Kalender</msg>
+  <msg key="lt_Manage_Calendar_Event">Gebeurteniscategori�n voor de kalender beheren</msg>
+  <msg key="Manage_Item_Types">Gebeurteniscategorie wijzigen</msg>
+  <msg key="pretty_name">Kalender</msg>
+  <msg key="Schedule">Planning</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.no_NO.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.no_NO.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="no_NO" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Legg inn avtale</msg>
+  <msg key="admin_pretty_name">Kalenderadministrasjon</msg>
+  <msg key="Create_a_new_Event">Lag en ny avtale</msg>
+  <msg key="full_includelet_pretty_name">Kalender</msg>
+  <msg key="lt_Manage_Calendar_Event">Administrer kalender innleggstyper</msg>
+  <msg key="Manage_Item_Types">Administrer avtaletyper</msg>
+  <msg key="pretty_name">Kalender</msg>
+  <msg key="Schedule">Avtale</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pl_PL.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pl_PL.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="pl_PL" charset="utf-8">
+
+  <msg key="Add_an_item">Dodaj termin</msg>
+  <msg key="admin_pretty_name">Administracja Kalendarzem</msg>
+  <msg key="Create_a_new_Event">Utwórz nowy Termin</msg>
+  <msg key="full_includelet_pretty_name">Pełny Kalendarz</msg>
+  <msg key="lt_Manage_Calendar_Event">Zarządzaj Typami Terminów Kalendarza</msg>
+  <msg key="Manage_Item_Types">Zarządzaj Typami Terminów</msg>
+  <msg key="pretty_name">Kalendarz</msg>
+  <msg key="Schedule">Plan</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pt_BR.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pt_BR.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="pt_BR" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Adicionar um item</msg>
+  <msg key="admin_pretty_name">Administra��o do Calend�rio</msg>
+  <msg key="Create_a_new_Event">Criar novo Evento</msg>
+  <msg key="full_includelet_pretty_name">Calend�rio Completo</msg>
+  <msg key="lt_Manage_Calendar_Event">Gerenciar Tipos de Evento do Calend�rio</msg>
+  <msg key="Manage_Item_Types">Gerenciar Tipos de Item</msg>
+  <msg key="pretty_name">Calend�rio</msg>
+  <msg key="Schedule">Hor�rio</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pt_PT.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.pt_PT.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="pt_PT" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">Adicionar um item</msg>
+  <msg key="admin_pretty_name">Administra��o do Calend�rio</msg>
+  <msg key="Create_a_new_Event">Criar um novo Evento</msg>
+  <msg key="full_includelet_pretty_name">Calend�rio Completo</msg>
+  <msg key="lt_Manage_Calendar_Event">Gerir Tipos de Eventos do Calend�rio</msg>
+  <msg key="Manage_Item_Types">Gerir Tipos de Itens</msg>
+  <msg key="pretty_name">Calend�rio</msg>
+  <msg key="Schedule">Agenda</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ru_RU.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.ru_RU.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="ru_RU" charset="utf-8">
+
+  <msg key="Add_an_item">Добавить запись</msg>
+  <msg key="admin_pretty_name">Администрирование календаря</msg>
+  <msg key="Create_a_new_Event">Добавить новое событие</msg>
+  <msg key="full_includelet_pretty_name">Общий календарь</msg>
+  <msg key="lt_Manage_Calendar_Event">Редактировать типы событий в календаре</msg>
+  <msg key="Manage_Item_Types">Редактировать типы событий</msg>
+  <msg key="pretty_name">Календарь</msg>
+  <msg key="Schedule">Расписание</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.sh_HR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.sh_HR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.sh_HR.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="sh_HR" charset="utf-8">
+
+  <msg key="Add_an_item">Dodaj stavku</msg>
+  <msg key="full_includelet_pretty_name">Citav Kalendar</msg>
+  <msg key="Manage_Item_Types">Izbrisi/Dodaj vrste stavki</msg>
+  <msg key="pretty_name">Kalendar</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.sv_SE.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.sv_SE.ISO-8859-1.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar-includelet"  locale="sv_SE" charset="ISO-8859-1">
+
+  <msg key="Add_an_item">L�gg till en post</msg>
+  <msg key="admin_pretty_name">Kalenderadministration</msg>
+  <msg key="Create_a_new_Event">Skapa en ny h�ndelse</msg>
+  <msg key="full_includelet_pretty_name">Detaljerad kalender</msg>
+  <msg key="lt_Manage_Calendar_Event">Hantera typer av h�ndelser</msg>
+  <msg key="Manage_Item_Types">Hantera typer av poster</msg>
+  <msg key="pretty_name">Kalender</msg>
+  <msg key="Schedule">Schema</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/catalog/calendar-includelet.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/catalog/calendar-includelet.tr_TR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/catalog/calendar-includelet.tr_TR.utf-8.xml	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="calendar-includelet"  locale="tr_TR" charset="utf-8">
+
+  <msg key="full_includelet_pretty_name">Bütün Takvim</msg>
+</message_catalog>
Index: openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.ado
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/Attic/calendar-admin-includelet.ado,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.ado	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,26 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+
+
+<ul>
+<li> <a href="@url@?action=add&show_cal_nav=0&force_calendar_id=@calendar_id@">#calendar-portlet.Create_a_new_Event#</a>
+<li> <a href="@url@calendar-item-types?calendar_id=@calendar_id@">#calendar-portlet.lt_Manage_Calendar_Event#</a>
+</ul>
+
Index: openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-admin-includelet.tcl	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,18 @@
+ad_page_contract {
+    The display logic for the calendar admin portlet
+
+    @author Arjun Sanyal (arjun@openforce.net)
+    @author Ben Adida (ben@openforce.net)
+    @cvs_id $Id: calendar-admin-includelet.tcl,v 1.1 2008/07/30 11:50:21 donb Exp $
+}
+
+# get stuff out of the config array
+set view $default_view
+
+if {[llength $calendar_id] > 1} {
+    return -code error "shouldn't be more than one calendar in admin!"
+}
+
+set url "calendar/"
+
+ad_return_template
Index: openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,81 @@
+  <style type="text/css" media="all">
+    @import "/resources/calendar/calendar.css";
+  </style>
+
+<table border="0" width="100%">
+  <tr>
+    <td valign="top">
+
+	<include src="/packages/calendar/www/mini-calendar" 
+        base_url="@ad_conn_url@" 
+        view="@view@" 
+        date="@date@" 
+        page_num="@page_num@">
+
+      <p align="left">
+
+      <ul align="left">
+        <if @create_p@><li> <a href="calendar/cal-item-new?date=@current_date@&start_time=&end_time=&time_p=1">#calendar-portlet.Add_an_item#</a></if>
+        <if @admin_p@><li> <a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@">#calendar-portlet.Manage_Item_Types#</a></if>
+      </ul>
+    </td>
+    <td valign=top>
+
+ <switch @view@>
+ <case value="day">
+   <include src="/packages/calendar/www/view-one-day-display" 
+   date="@date@" 
+   start_display_hour=7 
+   end_display_hour=22
+   page_num=@page_num@
+   hour_template="@hour_template;noquote@" 
+   item_template="@item_template;noquote@"
+   item_add_template="@item_add_template;noquote@"
+   prev_nav_template="@previous_link;noquote@"
+   next_nav_template="@next_link;noquote@"
+   base_url="@base_url@calendar/"
+   url_stub_callback="@url_stub_callback;noquote@" 
+   calendar_id_list="@list_of_calendar_ids@">
+ </case>
+
+<case value="list">
+   <include src="/packages/calendar/www/view-list-display" 
+   start_date=@start_date@ 
+   end_date=@end_date@ 
+   date=@current_date@ 
+   period_days=@period_days@
+   item_template="@item_template;noquote@"
+   calendar_id_list=@list_of_calendar_ids@ 
+   url_template="@url_template;noquote@" 
+   url_stub_callback="@url_stub_callback;noquote@" 
+   page_num=@page_num@
+   sort_by=@sort_by@> 
+</case>
+
+<case value="week">
+   <include src="/packages/calendar/www/view-week-display" 
+   date="@current_date@"
+   calendar_id_list=@list_of_calendar_ids@ 
+   base_url="@base_url@calendar/"
+   item_template="@item_template;noquote@"
+   page_num=@page_num@
+   prev_week_template="@prev_week_template;noquote@"
+   next_week_template="@next_week_template;noquote@"
+   url_stub_callback="@url_stub_callback;noquote@">
+</case>
+
+<case value="month">
+   <include src="/packages/calendar/www/view-month-display"
+   date=@current_date@
+   calendar_id_list=@list_of_calendar_ids@ 
+   item_template="@item_template;noquote@"
+   base_url="@base_url@calendar/"
+   page_num=@page_num@
+   prev_month_template="@prev_month_template;noquote@"
+   next_month_template="@next_month_template;noquote@"
+   url_stub_callback="@url_stub_callback;noquote@">
+</case>
+ </switch>
+    </td>
+  </tr>
+</table>
Index: openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,171 @@
+ad_page_contract {
+    The display logic for the calendar portlet
+
+    @author Arjun Sanyal (arjun@openforce.net)
+    @cvs_id $Id: calendar-full-includelet.tcl,v 1.1 2008/07/30 11:50:21 donb Exp $
+} {
+    {view ""}
+    {page_num ""}
+    {date ""}
+    {period_days 30}
+    {julian_date ""}
+} -properties {
+    
+} -validate {
+    valid_date -requires { date } {
+        if {![string equal $date ""]} {
+            if {[catch {set date [clock format [clock scan $date] -format "%Y-%m-%d"]} err]} {
+                ad_complain "Your input ($date) was not valid. It has to be in the form YYYYMMDD."
+            }
+        }
+    }
+}
+
+
+# get stuff out of the config array
+if { $view eq "" } {
+    set view $default_view
+}
+set list_of_calendar_ids $calendar_id
+
+set ad_conn_url [ad_conn url]
+set base_url [ad_conn package_url]
+
+if {$scoped_p == "t"} {
+    set show_calendar_name_p 1
+} else {
+    set show_calendar_name_p 0
+}
+
+if {[llength $list_of_calendar_ids] > 1} {
+    set force_calendar_id [calendar::have_private_p \
+                              -return_id 1 \
+                              -calendar_id_list $list_of_calendar_ids \
+                              -party_id [ad_conn user_id]]
+} else {
+    set force_calendar_id [lindex $list_of_calendar_ids 0]
+}
+
+# permissions
+set create_p [ad_permission_p $force_calendar_id cal_item_create]
+set edit_p [ad_permission_p $force_calendar_id cal_item_edit]
+set admin_p [ad_permission_p $force_calendar_id calendar_admin]
+
+# set up some vars
+if {[empty_string_p $date]} {
+    if {[empty_string_p $julian_date]} {
+        set date [dt_sysdate]
+    } else {
+        set date [db_string select_from_julian "select to_date(:julian_date ,'J') from dual"]
+    }
+}
+
+# global variables
+set current_date $date
+set date_format "YYYY-MM-DD HH24:MI"
+set return_url "[ns_conn url]?[ns_conn query]"
+set encoded_return_url [ns_urlencode $return_url]
+
+set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>\[ad_quotehtml \$item\]</a>"
+
+if {$create_p} {
+    set hour_template "<a href=calendar/cal-item-new?date=$current_date&start_time=\$day_current_hour>\$localized_day_current_hour</a>"
+    set item_add_template "<a href=calendar/cal-item-new?start_time=&time_p=1&end_time=&julian_date=\$julian_date title=\"[_ calendar.Add_Item]\">+</a>"
+} else {
+    set hour_template "\$localized_day_current_hour"
+    set item_add_template ""
+}
+
+set url_stub_callback "calendar_portlet_display::get_url_stub" 
+
+if {$view == "day"} {
+    if {[catch {set yest [clock format [clock scan "1 day ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+	set previous_link ""
+    } else {
+	if {[catch {clock scan $yest}]} {
+	    set previous_link ""
+	} else {
+	    set previous_link "<a href=\"?page_num=$page_num&date=\$yesterday\"><img border=0 src=\"[dt_left_arrow]\" alt=\"back one day\"></a>"
+	}
+    }
+
+    if {[catch {set tomor [clock format [clock scan "1 day" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set next_link ""
+    } else {
+	if {[catch {clock scan $tomor}]} {
+	    set next_link ""
+	} else {
+	    set next_link "<a href=\"?page_num=$page_num&date=\$tomorrow\"><img border=0 src=[dt_right_arrow] alt=\"forward one day\"></a>"
+	}
+    }
+} 
+
+if {$view == "week"} {
+    if {[catch {set last_w [clock format [clock scan "1 week ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set previous_link ""
+    } else {
+	if {[catch {clock scan $last_w}]} {
+	    set previous_link ""
+	} else {
+	    set previous_link "<a href=\"?date=\$last_week&view=week&page_num=$page_num\"><img border=0 src=[dt_left_arrow] alt=\"back one week\"></a>"
+	}
+    }
+
+    if {[catch {set next_w [clock format [clock scan "1 week" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set next_link ""
+    } else {
+	if {[catch {clock scan $next_w}]} {
+	    set next_link ""
+	} else {
+	    set next_link "<a href=\"?date=\$next_week&view=week&page_num=$page_num\"><img border=0 src=[dt_right_arrow] alt=\"forward one week\"></a>"
+	}
+    }
+
+    set prev_week_template "<a href=\"?date=\[ad_urlencode \[dt_julian_to_ansi \[expr \$first_weekday_julian - 7\]\]\]&view=week&page_num=$page_num\"><img border=0 src=[dt_left_arrow] alt=\"back one week\"></a>" 
+    set next_week_template "<a href=\"?date=\[ad_urlencode \[dt_julian_to_ansi \[expr \$first_weekday_julian + 7\]\]\]&view=week&page_num=$page_num\"><img border=0 src=[dt_right_arrow] alt=\"forward one week\"></a>" 
+}
+
+
+if {$view == "month"} {
+    if {[catch {set prev_m [clock format [clock scan "1 month ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set prev_month_template ""
+    } else {
+	if {[catch {clock scan $prev_m}]} {
+	    set prev_month_template ""
+	} else {
+	    set prev_month_template "<a href=?view=month&date=\[ad_urlencode \$prev_month\]&page_num=$page_num><img border=0 src=[dt_left_arrow] alt=\"back one month\"></a>"
+	}
+    }
+	
+    if {[catch {set next_m [clock format [clock scan "1 month" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set next_month_template ""
+    } else {
+	if {[catch {clock scan $next_m}]} {
+	    set next_month_template ""
+	} else {
+	    set next_month_template "<a href=?view=month&date=\[ad_urlencode \$next_month\]&page_num=$page_num><img border=0 src=[dt_right_arrow] alt=\"forward one month\"></a>"
+	}
+    }
+}
+
+
+if {$view == "list"} {
+    set sort_by [ns_queryget sort_by]
+
+    set thirty_days [expr 60*60*24*30]
+
+    set start_date [ns_fmttime [expr [ns_time] - $thirty_days] "%Y-%m-%d 00:00"]
+    set end_date [ns_fmttime [expr [ns_time] + $thirty_days] "%Y-%m-%d 00:00"]
+
+    set url_template "?view=list&sort_by=\$order_by&page_num=$page_num" 
+}
+
+ad_return_template
+
+
+
+
+
+
+
+
Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet-oracle.xql	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="select_day_items">
+<querytext>
+    select   
+      to_char(start_date, 'HH24:MI') as pretty_start_date,
+      to_char(end_date, 'HH24:MI') as pretty_end_date,
+      nvl(e.name, a.name) as name,
+      e.event_id as item_id,
+      c.calendar_name as calendar_name
+    from
+      acs_activities a,
+      acs_events e,
+      timespans s,
+      time_intervals t,
+      cal_items ci,
+      calendars c
+    where    
+      e.timespan_id = s.timespan_id
+      and  s.interval_id = t.interval_id
+      and  e.activity_id = a.activity_id
+      and  start_date between
+        to_date(:current_date,:date_format) and
+        to_date(:current_date,:date_format) + (24 - 1/3600)/24
+      and e.event_id = ci.cal_item_id
+      and c.calendar_id = ci.on_which_calendar
+      and c.calendar_id in ($list_of_calendar_ids)
+    UNION
+    select 
+      pretty_start_date,
+      pretty_end_date,
+      to_char(NULL) as name,
+      0 as item_id,
+      to_char(NULL) as calendar_name
+    from hours_of_the_day
+    order by pretty_start_date
+
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet-postgresql.xql	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="select_day_items">
+<querytext>
+    select   
+      to_char(start_date, 'HH24:MI') as pretty_start_date,
+      to_char(end_date, 'HH24:MI') as pretty_end_date,
+      coalesce(e.name, a.name) as name,
+      e.event_id as item_id,
+      c.calendar_name as calendar_name
+    from
+      acs_activities a,
+      acs_events e,
+      timespans s,
+      time_intervals t,
+      cal_items ci,
+      calendars c
+    where    
+      e.timespan_id = s.timespan_id
+      and  s.interval_id = t.interval_id
+      and  e.activity_id = a.activity_id
+      and  start_date between
+        to_date(:current_date,:date_format) and
+        to_date(:current_date,:date_format) + cast('23 hours 59 minutes 59 seconds' as interval)
+      and e.event_id = ci.cal_item_id
+      and c.calendar_id = ci.on_which_calendar
+      and c.calendar_id in ($list_of_calendar_ids)
+    UNION
+    select 
+      pretty_start_date,
+      pretty_end_date,
+      to_char(NULL) as name,
+      0 as item_id,
+      to_char(NULL) as calendar_name
+    from hours_of_the_day
+    order by pretty_start_date
+
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,59 @@
+<style type="text/css" media="all">
+  @import "/resources/calendar/calendar.css";
+</style>
+
+ <switch @view@>
+ <case value="day">
+   <include src="/packages/calendar/www/view-one-day-display" 
+   date="@date@" 
+   start_display_hour=7 
+   end_display_hour=22
+   page_num=@page_num@
+   hour_template="@hour_template;noquote@" 
+   item_template="@item_template;noquote@"
+   item_add_template="@item_add_template;noquote@"
+   prev_nav_template="@previous_link;noquote@"
+   next_nav_template="@next_link;noquote@"
+   base_url="@base_url@calendar/"
+   url_stub_callback="@url_stub_callback;noquote@" 
+   calendar_id_list="@list_of_calendar_ids@">
+ </case>
+
+  <case value="list">
+    <include src="/packages/calendar/www/view-list-display" 
+    start_date=@start_date@ 
+    end_date=@end_date@ 
+    date=@current_date@ 
+    period_days=@period_days@
+    item_template="@item_template;noquote@"
+    calendar_id_list=@list_of_calendar_ids@ 
+    page_num=@page_num@
+    url_template="@url_template;noquote@" 
+    url_stub_callback="@url_stub_callback;noquote@" 
+    sort_by=@sort_by@> 
+  </case>
+ 
+  <case value="week">
+    <include src="/packages/calendar/www/view-week-display" 
+    date="@current_date@"
+    calendar_id_list=@list_of_calendar_ids@ 
+    base_url="@base_url@calendar/"
+    item_template="@item_template;noquote@"
+    page_num=@page_num@
+    prev_week_template="@prev_week_template;noquote@"
+    next_week_template="@next_week_template;noquote@"
+    url_stub_callback="@url_stub_callback;noquote@">
+  </case>
+
+  <case value="month">
+    <include src="/packages/calendar/www/view-month-display"
+    date=@current_date@
+    calendar_id_list=@list_of_calendar_ids@ 
+    item_template="@item_template;noquote@"
+    base_url="@base_url@calendar/"
+    page_num=@page_num@
+    prev_month_template="@prev_month_template;noquote@"
+    next_month_template="@next_month_template;noquote@"
+    url_stub_callback="@url_stub_callback;noquote@">
+  </case>
+</switch>
Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,152 @@
+ad_page_contract {
+    The display logic for the calendar includelet
+
+    @author Arjun Sanyal (arjun@openforce.net)
+    @cvs_id $Id: calendar-includelet.tcl,v 1.1 2008/07/30 11:50:21 donb Exp $
+} {
+    {view ""}
+    {page_num ""}
+    {date ""}
+    {period_days 30}
+    {julian_date ""}
+} -properties {
+    
+}  -validate {
+    valid_date -requires { date } {
+        if {![string equal $date ""]} {
+            if {[catch {set date [clock format [clock scan $date] -format "%Y-%m-%d"]} err]} {
+                ad_complain "Your input ($date) was not valid. It has to be in the form YYYYMMDD."
+            }
+        }
+    }
+}
+
+
+# get stuff out of the config array
+set view $default_view
+set list_of_calendar_ids $calendar_id
+set base_url [ad_conn url]
+
+set scoped_p $scoped_p
+
+if {$scoped_p == "t"} {
+    set show_calendar_name_p 1
+} else {
+    set show_calendar_name_p 0
+}
+
+if {[llength $list_of_calendar_ids] > 1} {
+    set force_calendar_id [calendar::have_private_p \
+                              -return_id 1 \
+                              -calendar_id_list $list_of_calendar_ids \
+                              -party_id [ad_conn user_id]]
+} else {
+    set force_calendar_id [lindex $list_of_calendar_ids 0]
+}
+
+# permissions
+set create_p [ad_permission_p $force_calendar_id cal_item_create]
+set edit_p [ad_permission_p $force_calendar_id cal_item_edit]
+set admin_p [ad_permission_p $force_calendar_id calendar_admin]
+
+# set up some vars
+set date [ns_queryget date]
+if {[empty_string_p $date]} {
+    set date [dt_sysdate]
+}
+set current_date $date
+set date_format "YYYY-MM-DD HH24:MI"
+
+set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ns_urlencode "../"]&action=edit&cal_item_id=\$item_id>\[ad_quotehtml \$item\]</a>"
+
+if {$create_p} {
+    set hour_template "<a href=calendar/cal-item-new?date=$current_date&start_time=\$day_current_hour>\$localized_day_current_hour</a>"
+    set item_add_template "<a href=calendar/cal-item-new?start_time=&time_p=1&end_time=&julian_date=\$julian_date title=\"[_ calendar.Add_Item]\">+</a>"
+} else {
+    set hour_template "\$localized_day_current_hour"
+    set item_add_template ""
+}
+
+set url_stub_callback "calendar_portlet_display::get_url_stub" 
+
+if { $view == "day" } {
+    if {[catch {set yest [clock format [clock scan "1 day ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+	set previous_link ""
+    } else {
+	if {[catch {clock scan $yest}]} {
+	    set previous_link ""
+	} else {
+	    set previous_link "<a href=\"?page_num=$page_num&date=\$yesterday\"><img border=0 src=\"[dt_left_arrow]\" alt=\"back one day\"></a>"
+	}
+    }
+
+    if {[catch {set tomor [clock format [clock scan "1 day" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set next_link ""
+    } else {
+	if {[catch {clock scan $tomor}]} {
+	    set next_link ""
+	} else {
+	    set next_link "<a href=\"?page_num=$page_num&date=\$tomorrow\"><img border=0 src=[dt_right_arrow] alt=\"forward one day\"></a>"
+	}
+    }
+}
+
+if {$view == "week"} {
+    if {[catch {set last_w [clock format [clock scan "1 week ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set previous_link ""
+    } else {
+	if {[catch {clock scan $last_w}]} {
+	    set previous_link ""
+	} else {
+	    set previous_link "<a href=\"?date=\$last_week&view=week&page_num=$page_num\"><img border=0 src=[dt_left_arrow] alt=\"back one week\"></a>"
+	}
+    }
+
+    if {[catch {set next_w [clock format [clock scan "1 week" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set next_link ""
+    } else {
+	if {[catch {clock scan $next_w}]} {
+	    set next_link ""
+	} else {
+	    set next_link "<a href=\"?date=\$next_week&view=week&page_num=$page_num\"><img border=0 src=[dt_right_arrow] alt=\"forward one week\"></a>"
+	}
+    }
+    set prev_week_template "<a href=\"?date=\[ad_urlencode \[dt_julian_to_ansi \[expr \$first_weekday_julian - 7\]\]\]&view=week&page_num=$page_num\"><img border=0 src=[dt_left_arrow] alt=\"back one week\"></a>" 
+    set next_week_template "<a href=\"?date=\[ad_urlencode \[dt_julian_to_ansi \[expr \$first_weekday_julian + 7\]\]\]&view=week&page_num=$page_num\"><img border=0 src=[dt_right_arrow] alt=\"forward one week\"></a>" 
+}
+
+if {$view == "month"} {
+    if {[catch {set prev_m [clock format [clock scan "1 month ago" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set previous_link ""
+    } else {
+	if {[catch {clock scan $prev_m}]} {
+	    set previous_link ""
+	} else {
+	    set previous_link "<a href=?view=month&date=\$ansi_date&page_num=$page_num><img border=0 src=[dt_left_arrow] alt=\"back one month\"></a>"
+	}
+    }
+	
+    if {[catch {set next_m [clock format [clock scan "1 month" -base [clock scan $date]] -format "%Y-%m-%d"]}]} {
+        set next_link ""
+    } else {
+	if {[catch {clock scan $next_m}]} {
+	    set next_link ""
+	} else {
+	    set next_link "<a href=?view=month&date=\$ansi_date&page_num=$page_num><img border=0 src=[dt_right_arrow] alt=\"forward one month\"></a>"
+	}
+    }
+}
+
+if {$view == "list"} {
+    set sort_by [ns_queryget sort_by]
+
+    set thirty_days [expr 60*60*24*30]
+
+    set start_date [ns_fmttime [expr [ns_time] - $thirty_days] "%Y-%m-%d 00:00"]
+    set end_date [ns_fmttime [expr [ns_time] + $thirty_days] "%Y-%m-%d 00:00"]
+
+    set url_template "?view=list&sort_by=\$order_by&page_num=$page_num" 
+}
+
+
+ad_return_template
Index: openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.adp	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,14 @@
+<style type="text/css" media="all">
+  @import "/resources/calendar/calendar.css";
+</style>
+
+<include src="/packages/calendar/www/view-list-display" 
+  start_date="@start_date@"
+  date="@current_date@" 
+  period_days="@period_days@"
+  item_template="@item_template;noquote@"
+  page_num="@page_num@"
+  calendar_id_list="@list_of_calendar_ids@"
+  url_template="@url_template;noquote@" 
+  url_stub_callback="@url_stub_callback;noquote@" 
+  sort_by="@sort_by@"> 
Index: openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/lib/calendar-list-includelet.tcl	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,77 @@
+ad_page_contract {
+    The display logic for the calendar portlet
+
+    @author Arjun Sanyal (arjun@openforce.net)
+    @cvs_id $Id: calendar-list-includelet.tcl,v 1.1 2008/07/30 11:50:21 donb Exp $
+} {
+    {view ""}
+    {page_num ""}
+    {date ""}
+    {julian_date ""}
+    {period_days 60}
+    {sort_by ""}
+} -properties {
+    
+}  -validate {
+    valid_date -requires { date } {
+        if {![string equal $date ""]} {
+            if {[catch {set date [clock format [clock scan $date] -format "%Y-%m-%d"]} err]} {
+                ad_complain "Your input was not valid. It has to be in the form YYYYMMDD."
+            }
+        }
+    }
+}
+
+
+# get stuff out of the config array
+if { $view eq "" } {
+    set view $default_view
+}
+set list_of_calendar_ids $calendar_id
+
+if {$scoped_p == "t"} {
+    set show_calendar_name_p 1
+} else {
+    set show_calendar_name_p 0
+}
+
+if {[llength $list_of_calendar_ids] > 1} {
+    set force_calendar_id [calendar::have_private_p \
+                              -return_id 1 \
+                              -calendar_id_list $list_of_calendar_ids \
+                              -party_id [ad_conn user_id]]
+} else {
+    set force_calendar_id [lindex $list_of_calendar_ids 0]
+}
+
+# permissions
+set create_p [ad_permission_p $force_calendar_id cal_item_create]
+set edit_p [ad_permission_p $force_calendar_id cal_item_edit]
+set admin_p [ad_permission_p $force_calendar_id calendar_admin]
+
+# set up some vars
+if {[empty_string_p $date]} {
+    if {[empty_string_p $julian_date]} {
+        set date [dt_sysdate]
+    } else {
+        set date [db_string select_from_julian "select to_date(:julian_date ,'J') from dual"]
+    }
+}
+
+set current_date $date
+set date_format "YYYY-MM-DD HH24:MI"
+set return_url "[ns_conn url]?[ns_conn query]"
+set encoded_return_url [ns_urlencode $return_url]
+
+# List view only
+set sort_by [ns_queryget sort_by]
+
+set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>\[ad_quotehtml \$item\]</a>"
+
+set thirty_days [expr 60*60*24*30]
+set start_date [ns_fmttime [expr [ns_time] - $thirty_days] "%Y-%m-%d 00:00"]
+
+set url_template "?view=list&sort_by=\$order_by&page_num=$page_num" 
+set url_stub_callback "calendar_portlet_display::get_url_stub" 
+
+ad_return_template
Index: openacs-4/packages/calendar-includelet/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/tcl/apm-callback-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/tcl/apm-callback-procs.tcl	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,67 @@
+ad_library {
+
+    Forums Portlet Install library
+
+    Procedures that deal with installing, instantiating, mounting.
+
+    @creation-date 2003-12-31
+    @author Don Baccus <dhogaza@pacifier.com>
+    @cvs-id 
+}
+
+namespace eval calendar_includelet::install {}
+
+ad_proc -private calendar_includelet::install::package_install {} {
+    Package installation callback proc
+} {
+
+    db_transaction {
+
+        # Admin includelet
+        layout::includelet::new \
+            -name calendar_admin_includelet \
+            -description "Displays calendar admin includelet" \
+            -title #calendar-includelet.admin_pretty_name# \
+            -application calendar \
+            -template /packages/calendar-includelet/lib/calendar-admin-includelet \
+            -required_privilege admin \
+            -initializer calendar_includelet_utilities::configure_calendar_id \
+
+        # List includelet
+        layout::includelet::new \
+            -name calendar_list_includelet \
+            -description "Displays calendar list includelet" \
+            -title #calendar-includelet.Schedule# \
+            -application calendar \
+            -template /packages/calendar-includelet/lib/calendar-list-includelet \
+            -initializer calendar_includelet_utilities::configure_calendar_id
+
+        # Full includelet
+        layout::includelet::new \
+            -name calendar_full_includelet \
+            -description "Displays the calendar" \
+            -title #calendar-includelet.full_includelet_pretty_name# \
+            -application calendar \
+            -template /packages/calendar-includelet/lib/calendar-full-includelet \
+            -initializer calendar_includelet_utilities::configure_calendar_id
+
+        # User includelet
+        layout::includelet::new \
+            -name calendar_includelet \
+            -description "Displays the calendar" \
+            -title #calendar-includelet.pretty_name# \
+            -application calendar \
+            -template /packages/calendar-includelet/lib/calendar-includelet \
+            -initializer calendar_includelet_utilities::configure_calendar_id
+    }
+}
+
+ad_proc -private calendar_includelet::install::package_uninstall {} {
+    Package uninstallation callback proc
+} {
+    layout::includelet::delete -name calendar_includelet
+    layout::includelet::delete -name calendar_admin_includelet
+    layout::includelet::delete -name calendar_full_includelet
+    layout::includelet::delete -name calendar_list_includelet
+}
+
Index: openacs-4/packages/calendar-includelet/tcl/calendar-includelet-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/tcl/Attic/calendar-includelet-display-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/tcl/calendar-includelet-display-procs.tcl	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,37 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# calendar-portlet/tcl/calendar-portlet-display-procs.tcl
+
+ad_library {
+
+Procedures to support the calendar portlet display
+
+@creation-date April 15, 2002
+@author ben@openforce.net
+@cvs-id $Id: calendar-includelet-display-procs.tcl,v 1.1 2008/07/30 11:50:21 donb Exp $
+
+}
+
+namespace eval calendar_portlet_display {
+    
+    ad_proc -public get_url_stub {
+        calendar_id
+    } {
+        return [site_node_object_map::get_url -object_id $calendar_id]
+    }
+    
+}
Index: openacs-4/packages/calendar-includelet/tcl/calendar-includelet-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/tcl/calendar-includelet-utility-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/tcl/calendar-includelet-utility-procs.tcl	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,85 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+ad_library {
+
+    Some useful utilities for calendar includelets.
+
+    @author Don Baccus (dhogaza@pacifier.com)
+    @cvs-id $Id: calendar-includelet-utility-procs.tcl,v 1.1 2008/07/30 11:50:21 donb Exp $
+
+}
+
+namespace eval calendar_includelet_utilities {}
+
+ad_proc calendar_includelet_utilities::configure_calendar_id {
+    element_id
+} {
+    Set the includelet's calendar_id param, creating a new private calendar for the
+    includelet's owner if necessary.
+
+    @param element_id The calendar includelet
+
+} {
+
+    set pageset_id [layout::page::get_column_value \
+                        -page_id [layout::element::get_column_value \
+                                     -element_id $element_id \
+                                     -column page_id] \
+                        -column pageset_id]
+    set package_id [layout::element::get_column_value \
+                       -element_id $element_id \
+                       -column package_id]
+    set party_id [layout::pageset::get_column_value \
+                     -pageset_id $pageset_id \
+                     -column owner_id]
+ 
+    if { $pageset_id == [layout::pageset::get_master_template_id] } {
+
+        # We're initializing the master template's or admin portal's copy of
+        # calendar, create a subsite group calendar if one does not already exist.
+
+        set group_id [application_group::group_id_from_package_id \
+                         -package_id [ad_conn subsite_id]]
+
+        if { ![db_0or1row get_group_calendar_id {}] } {
+            set calendar_id [calendar::new \
+                                  -owner_id $group_id \
+                                  -private_p "f" \
+                                  -calendar_name Group \
+                                  -package_id $package_id]
+        }
+
+    } else {
+
+        # We're initializing a personal portal.  Create a calendar for the user
+        # if they don't already have one.  The group calendar's id has already been
+        # copied over by the portal package.
+
+        if { ![db_0or1row get_calendar_id {}] } {
+            set calendar_id [calendar::new \
+                                -owner_id $party_id \
+                                -private_p t \
+                                -calendar_name Personal \
+                                -package_id $package_id]
+        }
+    }
+
+    layout::element::parameter::add_values \
+        -element_id $element_id \
+        -parameters [list calendar_id $calendar_id default_view day scoped_p f]
+
+}
Index: openacs-4/packages/calendar-includelet/tcl/calendar-includelet-utility-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/tcl/calendar-includelet-utility-procs.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-includelet/tcl/calendar-includelet-utility-procs.xql	30 Jul 2008 11:50:21 -0000	1.1
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="calendar_includelet_utilities::configure_calendar_id.get_group_calendar_id">
+    <querytext>
+      select calendar_id
+      from calendars
+      where private_p = 'f'
+        and owner_id = :group_id
+    </querytext>
+</fullquery>
+
+<fullquery name="calendar_includelet_utilities::configure_calendar_id.get_calendar_id">
+    <querytext>
+      select calendar_id
+      from calendars
+      where private_p = 't'
+        and owner_id = :party_id
+    </querytext>
+</fullquery>
+ 
+</queryset>
Index: openacs-4/packages/file-storage-includelet/file-storage-includelet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/file-storage-includelet.info,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/file-storage-includelet.info	30 Jul 2008 11:51:14 -0000	1.1
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!-- Generated by the OpenACS Package Manager -->
+
+<package key="file-storage-includelet" url="http://openacs.org/repository/apm/packages/file-storage-includelet" type="apm_service">
+    <package-name>File Storage Includelet</package-name>
+    <pretty-plural>File Storage Includelets</pretty-plural>
+    <initial-install-p>f</initial-install-p>
+    <singleton-p>t</singleton-p>
+    
+    <version name="1.0" url="http://openacs.org/repository/download/apm/file-storage-includelet-1.0.apm">
+        <owner url="http://openacs.org">OpenACS</owner>
+        <release-date>2008-07-16</release-date>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+
+        <provides url="file-storage-includelet" version="1.0"/>
+        <requires url="file-storage" version="5.2.0"/>
+        <requires url="layout-manager" version="1.0"/>
+
+        <callbacks>
+            <callback type="after-install"  proc="file_storage_includelet::install::package_install"/>
+            <callback type="after-upgrade"  proc="file_storage_includelet::install::after_upgrade"/>
+        </callbacks>
+
+        <parameters>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowParametersLinkP"  default="1" description="Should we link to the file-storage instance's parameter settings page?"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="pretty_name"  default="#file-storage-includelet.pretty_name#" description="The name to show in the title bar of a portlet"/>
+        </parameters>
+
+    </version>
+</package>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ar_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ar_EG.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ar_EG.utf-8.xml	30 Jul 2008 11:51:14 -0000	1.1
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="ar_EG" charset="utf-8">
+
+  <msg key="create_new_folder">إخلقْ ملفّ جديدً</msg>
+  <msg key="pretty_name">المُسْتَنَدات</msg>
+  <msg key="upload_file">أرسلْ ملفاً</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ar_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ar_LB.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ar_LB.utf-8.xml	30 Jul 2008 11:51:14 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="ar_LB" charset="utf-8">
+
+  <msg key="advanced">(&amp;lt;font=red&amp;gt;Advanced&amp;lt;/font&amp;gt;)</msg>
+  <msg key="byte">بايت</msg>
+  <msg key="bytes">بايتس</msg>
+  <msg key="create_new_folder">إخلقْ ملفّ جديداً</msg>
+  <msg key="create_url">أخلقْ موقعاً</msg>
+  <msg key="edit_fs_parameters">Edit file storage parameters (ADVANCED)</msg>
+  <msg key="edit_upload_size_limit">Edit Upload Size Limit</msg>
+  <msg key="item">بند</msg>
+  <msg key="items">بنود</msg>
+  <msg key="lt_File_Storage_Administ">File Storage Administration</msg>
+  <msg key="pretty_name">المُسْتَنَدات</msg>
+  <msg key="upload_file">أرسلْ ملفاً</msg>
+  <msg key="view_details">شاهدْ التفاصيل</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ast_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ast_ES.ISO-8859-1.xml	30 Jul 2008 11:51:14 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="ast_ES" charset="ISO-8859-1">
+
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Crear un Directoriu nuevu</msg>
+  <msg key="create_url">Crear URL</msg>
+  <msg key="item">it�m</msg>
+  <msg key="items">items</msg>
+  <msg key="pretty_name">Documentos</msg>
+  <msg key="upload_file">Xubir un archivu</msg>
+  <msg key="view_details">ver detalles</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ca_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ca_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ca_ES.ISO-8859-1.xml	30 Jul 2008 11:51:14 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="ca_ES" charset="ISO-8859-1">
+
+  <msg key="byte">byte </msg>
+  <msg key="bytes">bytes </msg>
+  <msg key="create_new_folder">Crear una carpeta nova </msg>
+  <msg key="create_url">Crear una URL </msg>
+  <msg key="edit_upload_size_limit">Editar el l�mit de grand�ria de c�rregues</msg>
+  <msg key="item">arxiu </msg>
+  <msg key="items">arxius </msg>
+  <msg key="lt_File_Storage_Administ">Gesti� de l'emmagatzemament d'arxius</msg>
+  <msg key="pretty_name">Documents </msg>
+  <msg key="upload_file">Carregar un arxiu </msg>
+  <msg key="view_details">Veure detalls </msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ch_zh.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ch_zh.utf-8.xml	30 Jul 2008 11:51:14 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet" locale="ch_zh" charset="utf-8">
+
+  <msg key="byte">字节</msg>
+  <msg key="bytes">字节</msg>
+  <msg key="create_new_folder">创建新文件夹</msg>
+  <msg key="create_url">创建URL</msg>
+  <msg key="item">项</msg>
+  <msg key="items">项</msg>
+  <msg key="pretty_name">文档</msg>
+  <msg key="upload_file">上传文件</msg>
+  <msg key="view_details">查看详细信息</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.da_DK.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.da_DK.ISO-8859-1.xml	30 Jul 2008 11:51:14 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="da_DK" charset="ISO-8859-1">
+
+  <msg key="advanced">(&lt;font=red&gt;Avanceret&lt;/font&gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Opret en nyt mappe</msg>
+  <msg key="create_url">Opret en URL</msg>
+  <msg key="edit_fs_parameters">Rediger parametre for fildeling (AVANCERET)</msg>
+  <msg key="edit_upload_size_limit">Rediger Upload St�rrelse Begr�nsing</msg>
+  <msg key="item">emne</msg>
+  <msg key="items">emner</msg>
+  <msg key="lt_File_Storage_Administ">Fildepot administration</msg>
+  <msg key="pretty_name">Dokumenter</msg>
+  <msg key="upload_file">Upload en fil</msg>
+  <msg key="view_details">vis detaljer</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.de_DE.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.de_DE.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="de_DE" charset="ISO-8859-1">
+
+  <msg key="advanced">(&lt;font=red&gt;Fortgeschritten&lt;/font&gt;)</msg>
+  <msg key="byte">Byte</msg>
+  <msg key="bytes">Bytes</msg>
+  <msg key="create_new_folder">Neuen Ordner erstellen</msg>
+  <msg key="create_url">Neue URL hinzuf�gen</msg>
+  <msg key="edit_fs_parameters">Parameter f�r Dateiablage editieren (FORTGESCHRITTEN)</msg>
+  <msg key="edit_upload_size_limit">Gr��enbeschr�nkung f�r das Hochladen bearbeiten</msg>
+  <msg key="item">Element</msg>
+  <msg key="items">Elemente</msg>
+  <msg key="lt_File_Storage_Administ">Dateiablage verwalten</msg>
+  <msg key="pretty_name">Dateien</msg>
+  <msg key="upload_file">Neue Datei hochladen</msg>
+  <msg key="view_details">Details anzeigen</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.el_GR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.el_GR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.el_GR.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="el_GR" charset="utf-8">
+
+  <msg key="create_new_folder">Δημιουργία νέου φακέλου</msg>
+  <msg key="items">στοιχεία</msg>
+  <msg key="pretty_name">Έγγραφα</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.en_AU.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.en_AU.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.en_AU.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet" locale="en_AU" charset="ISO-8859-1">
+
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Create a new folder</msg>
+  <msg key="create_url">Create a URL</msg>
+  <msg key="edit_upload_size_limit">Edit Upload Size Limit</msg>
+  <msg key="item">item</msg>
+  <msg key="items">items</msg>
+  <msg key="lt_File_Storage_Administ">File Storage Administration</msg>
+  <msg key="pretty_name">Documents</msg>
+  <msg key="upload_file">Upload a file</msg>
+  <msg key="view_details">view details</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.en_US.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.en_US.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="en_US" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">File Storage Administration</msg>
+  <msg key="advanced">(&lt;font=red&gt;Advanced&lt;/font&gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="content_pretty_name">File Storage Content</msg>
+  <msg key="create_new_folder">Create a new folder</msg>
+  <msg key="create_url">Create a URL</msg>
+  <msg key="edit_fs_parameters">Edit file storage parameters (ADVANCED)</msg>
+  <msg key="edit_upload_size_limit">Edit Upload Size Limit</msg>
+  <msg key="item">item</msg>
+  <msg key="items">items</msg>
+  <msg key="lt_File_Storage_Administ">File Storage Administration</msg>
+  <msg key="open_folder_folders_name">Open folder %folders.name%</msg>
+  <msg key="pretty_name">Documents</msg>
+  <msg key="upload_file">Upload a file</msg>
+  <msg key="view_details">view details</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_CO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_CO.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_CO.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="es_CO" charset="ISO-8859-1">
+
+  <msg key="advanced">(&amp;lt;font=red&amp;gt;Advanced&amp;lt;/font&amp;gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Crear carpeta nueva</msg>
+  <msg key="create_url">Crear un enlace URL</msg>
+  <msg key="edit_fs_parameters">Editar par�metros de almacenamiento de carpetas (AVANZADO)</msg>
+  <msg key="edit_upload_size_limit">Editar el limite para subir archivos</msg>
+  <msg key="item">archivo</msg>
+  <msg key="items">archivos</msg>
+  <msg key="lt_File_Storage_Administ">Administraci�n de Documentos</msg>
+  <msg key="pretty_name">Documentos</msg>
+  <msg key="upload_file">Subir un archivo</msg>
+  <msg key="view_details">ver detalles</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_ES.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="es_ES" charset="ISO-8859-1">
+
+  <msg key="advanced">(&lt;font color=red&gt;Avanzado&lt;/font&gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Crear carpeta nueva</msg>
+  <msg key="create_url">Crear un enlace</msg>
+  <msg key="edit_fs_parameters">Editar par�metros de documentos (AVANZADO)</msg>
+  <msg key="edit_upload_size_limit">Editar el limite para subir archivos</msg>
+  <msg key="item">archivo</msg>
+  <msg key="items">archivos</msg>
+  <msg key="lt_File_Storage_Administ">Administraci�n de Documentos </msg>
+  <msg key="open_folder_folders_name">Abrir carpeta %folders.name%</msg>
+  <msg key="pretty_name">Documentos</msg>
+  <msg key="upload_file">Subir un archivo</msg>
+  <msg key="view_details">ver detalles</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_GT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_GT.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.es_GT.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="es_GT" charset="ISO-8859-1">
+
+  <msg key="advanced">(&amp;lt;font=red&amp;gt;Avanzado&amp;lt;/font&amp;gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Crear carpeta nueva</msg>
+  <msg key="create_url">Crear un enlace</msg>
+  <msg key="edit_fs_parameters">Editar par�metros de documentos (AVANZADO)</msg>
+  <msg key="edit_upload_size_limit">Editar el limite para cargar archivos</msg>
+  <msg key="item">archivo</msg>
+  <msg key="items">archivos</msg>
+  <msg key="lt_File_Storage_Administ">Administraci�n de Documentos</msg>
+  <msg key="pretty_name">Documentos</msg>
+  <msg key="upload_file">Subir un archivo</msg>
+  <msg key="view_details">ver detalles</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.fi_FI.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.fi_FI.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="fi_FI" charset="utf-8">
+
+  <msg key="byte">tavu</msg>
+  <msg key="bytes">tavua</msg>
+  <msg key="create_new_folder">Luo uusi kansio</msg>
+  <msg key="create_url">Lisää www-linkki</msg>
+  <msg key="item">nimike</msg>
+  <msg key="items">kpl</msg>
+  <msg key="pretty_name">Dokumentit</msg>
+  <msg key="upload_file">Tallenna tiedosto</msg>
+  <msg key="view_details">näytä tiedot</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.fr_FR.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.fr_FR.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="fr_FR" charset="ISO-8859-1">
+
+  <msg key="byte">octet</msg>
+  <msg key="bytes">octets</msg>
+  <msg key="create_new_folder">Cr�er un dossier</msg>
+  <msg key="create_url">Cr�er un lien</msg>
+  <msg key="item">�l�ment</msg>
+  <msg key="items">�l�ments</msg>
+  <msg key="pretty_name">Dossiers</msg>
+  <msg key="upload_file">Envoyer un fichier</msg>
+  <msg key="view_details">voir d�tails</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.gl_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.gl_ES.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="gl_ES" charset="ISO-8859-1">
+
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Crear novo cartafol</msg>
+  <msg key="create_url">Crear URL (enderezo)</msg>
+  <msg key="item">�tem</msg>
+  <msg key="items">�tems</msg>
+  <msg key="pretty_name">Documentos</msg>
+  <msg key="upload_file">Cargar un ficheiro</msg>
+  <msg key="view_details">ver detalles</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.hi_IN.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.hi_IN.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.hi_IN.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="hi_IN" charset="utf-8">
+
+  <msg key="advanced">(&lt;फ़ोन्ट=लाल&gt; प्रगतिशील &lt;/फ़ोन्ट&gt;</msg>
+  <msg key="byte">बाईट</msg>
+  <msg key="bytes">बाईटस </msg>
+  <msg key="create_new_folder">एक नया फ़ोल्डर बनाओ</msg>
+  <msg key="create_url">नया यू आर एल बनाओ</msg>
+  <msg key="edit_fs_parameters">फ़ाईल सन्चयन का सम्पादन (एड्वान्सड)</msg>
+  <msg key="edit_upload_size_limit">अपलोड कर आकार सीमा निधारित करे</msg>
+  <msg key="item">वस्तु</msg>
+  <msg key="items">वस्तुए </msg>
+  <msg key="lt_File_Storage_Administ">फ़ाईल सन्चयन प्रशासन</msg>
+  <msg key="pretty_name">दस्तावेज</msg>
+  <msg key="upload_file">फ़ाईल अपलोड करे</msg>
+  <msg key="view_details">विवरण देखो</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.hu_HU.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.hu_HU.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="hu_HU" charset="utf-8">
+
+  <msg key="create_new_folder">Új mappa készítése</msg>
+  <msg key="create_url">Új URL készítése</msg>
+  <msg key="items">darab</msg>
+  <msg key="pretty_name">Dokumentumok</msg>
+  <msg key="upload_file">File feltöltése</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.it_IT.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.it_IT.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="it_IT" charset="ISO-8859-1">
+
+  <msg key="advanced">(&amp;lt;font=red&amp;gt;Advanced&amp;lt;/font&amp;gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Crea una nuova cartella</msg>
+  <msg key="create_url">Crea una URL</msg>
+  <msg key="edit_fs_parameters">Editare i parametri della cartella di memorizzazione (AVANZATO)</msg>
+  <msg key="edit_upload_size_limit">Modifica il limite alla dimensione in upload</msg>
+  <msg key="item">elemento</msg>
+  <msg key="items">elementi</msg>
+  <msg key="lt_File_Storage_Administ">Amministrazione della File Storage</msg>
+  <msg key="pretty_name">Documenti</msg>
+  <msg key="upload_file">Carica un file</msg>
+  <msg key="view_details">vedi i dettagli</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ja_JP.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ja_JP.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="ja_JP" charset="utf-8">
+
+  <msg key="create_new_folder">新規フォルダ</msg>
+  <msg key="upload_file">ファイルをアップロード</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ko_KR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ko_KR.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="ko_KR" charset="utf-8">
+
+  <msg key="byte">바이트</msg>
+  <msg key="bytes">바이트</msg>
+  <msg key="create_new_folder">새 폴더 생성</msg>
+  <msg key="create_url">URL 생성</msg>
+  <msg key="item">항목</msg>
+  <msg key="items">항목</msg>
+  <msg key="pretty_name">문서</msg>
+  <msg key="upload_file">파일 업로드</msg>
+  <msg key="view_details">상세보기</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ms_MY.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ms_MY.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ms_MY.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="ms_MY" charset="utf-8">
+
+  <msg key="byte">bait</msg>
+  <msg key="bytes">bait</msg>
+  <msg key="create_new_folder">Tambah folder baru</msg>
+  <msg key="create_url">Tambah URL</msg>
+  <msg key="item">butiran </msg>
+  <msg key="items">butiran-butiran </msg>
+  <msg key="pretty_name">Dokumen</msg>
+  <msg key="upload_file">Muat naik fail</msg>
+  <msg key="view_details">paparkan keterangan lanjut</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.nl_NL.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.nl_NL.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="nl_NL" charset="ISO-8859-1">
+
+  <msg key="advanced">(&lt;font=red&gt;Gevorderden&lt;/font&gt;) </msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Nieuwe map aanmaken</msg>
+  <msg key="create_url">URL aanmaken</msg>
+  <msg key="edit_fs_parameters">Parameters van de bestandsopslag bewerken (GEVORDERDEN)</msg>
+  <msg key="edit_upload_size_limit">Limiet voor bestandsaanbod bewerken</msg>
+  <msg key="item">bestand</msg>
+  <msg key="items">bestanden</msg>
+  <msg key="lt_File_Storage_Administ">Administratie Bestandsopslag </msg>
+  <msg key="pretty_name">Bestanden</msg>
+  <msg key="upload_file">Bestand aanbieden</msg>
+  <msg key="view_details">bekijk details</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.nn_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.nn_NO.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.nn_NO.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="nn_NO" charset="ISO-8859-1">
+
+  <msg key="advanced"> (&lt;font=red&gt;Avansert&lt;/font&gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Lag ny mappe</msg>
+  <msg key="create_url">Lag lenkje (URL)</msg>
+  <msg key="edit_fs_parameters">Rediger lagringsparametrat (AVANSERT)</msg>
+  <msg key="edit_upload_size_limit">Rediger grense for opplasting</msg>
+  <msg key="item">innlegg</msg>
+  <msg key="items">innlegg</msg>
+  <msg key="lt_File_Storage_Administ">Administrasjo av fillager</msg>
+  <msg key="pretty_name">Dokument</msg>
+  <msg key="upload_file">Last opp ei fil</msg>
+  <msg key="view_details">sj� detaljar</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.no_NO.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.no_NO.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="no_NO" charset="ISO-8859-1">
+
+  <msg key="advanced">(&lt;font=red&gt;Avansert&lt;/font&gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Opprett ny mappe</msg>
+  <msg key="create_url">Opprett en URL</msg>
+  <msg key="edit_fs_parameters">Rediger lagringsparametre (AVANSERT)</msg>
+  <msg key="edit_upload_size_limit">Rediger maks st�rrelse for opplasting</msg>
+  <msg key="item">innlegg</msg>
+  <msg key="items">innlegg</msg>
+  <msg key="lt_File_Storage_Administ">Administrasjon av fillager</msg>
+  <msg key="pretty_name">Dokumenter</msg>
+  <msg key="upload_file">Last opp en fil</msg>
+  <msg key="view_details">se detaljer</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pl_PL.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pl_PL.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="pl_PL" charset="utf-8">
+
+  <msg key="advanced">(&lt;font=red&gt;Zaawansowane&lt;/font&gt;)</msg>
+  <msg key="byte">bajt</msg>
+  <msg key="bytes">bajtów</msg>
+  <msg key="create_new_folder">Utwórz nowy folder</msg>
+  <msg key="create_url">Utwórz URL</msg>
+  <msg key="edit_fs_parameters">Edytuj parametry składowania plików (ZAAWANSOWANE)</msg>
+  <msg key="edit_upload_size_limit">Edytuj Limit Wgrywanych Plików</msg>
+  <msg key="item">plik</msg>
+  <msg key="items">pliki</msg>
+  <msg key="lt_File_Storage_Administ">Administracja Składowaniem Plików</msg>
+  <msg key="pretty_name">Dokumenty</msg>
+  <msg key="upload_file">Wyślij plik</msg>
+  <msg key="view_details">pokaż szczegóły</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pt_BR.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pt_BR.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="pt_BR" charset="ISO-8859-1">
+
+  <msg key="advanced">(&amp;lt;font=red&amp;gt;Advanced&amp;lt;/font&amp;gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Criar uma nova pasta</msg>
+  <msg key="create_url">Criar um atalho de Endere�o Eletr�nico (URL)</msg>
+  <msg key="edit_fs_parameters">Edit file storage parameters (ADVANCED)</msg>
+  <msg key="edit_upload_size_limit">Editar Limite do Tamanho de Envio</msg>
+  <msg key="item">item</msg>
+  <msg key="items">itens</msg>
+  <msg key="lt_File_Storage_Administ">Administra��o da Armazenagem de Arquivo</msg>
+  <msg key="pretty_name">Documentos</msg>
+  <msg key="upload_file">Fazer Upload de um arquivo</msg>
+  <msg key="view_details">ver detalhes</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pt_PT.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.pt_PT.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="pt_PT" charset="ISO-8859-1">
+
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Criar uma nova pasta</msg>
+  <msg key="create_url">Criar um URL</msg>
+  <msg key="item">item</msg>
+  <msg key="items">itens</msg>
+  <msg key="pretty_name">Documentos</msg>
+  <msg key="upload_file">Carregar um ficheiro</msg>
+  <msg key="view_details">ver detalhes</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ro_RO.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ro_RO.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ro_RO.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="ro_RO" charset="utf-8">
+
+  <msg key="advanced"> (&lt;font=red&gt;Avansat&lt;/font&gt;)</msg>
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Creează un director nou</msg>
+  <msg key="create_url">Creează un URL</msg>
+  <msg key="edit_fs_parameters">Modifică parametrii pentru stocarea de fişiere (AVANSAT)</msg>
+  <msg key="edit_upload_size_limit">Modifică Limita Superioară pentru Încărcarea de Fişiere</msg>
+  <msg key="item">obiect</msg>
+  <msg key="items">elemente</msg>
+  <msg key="lt_File_Storage_Administ">Administrare pentru Stocare de Fişiere</msg>
+  <msg key="pretty_name">Documente</msg>
+  <msg key="upload_file">Încarcă un fişier</msg>
+  <msg key="view_details">vezi detaliile</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ru_RU.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.ru_RU.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="ru_RU" charset="utf-8">
+
+  <msg key="advanced">(&lt;font=red&gt;Дополнительно&lt;/font&gt;)</msg>
+  <msg key="byte">байт</msg>
+  <msg key="bytes">байт(а)</msg>
+  <msg key="create_new_folder">Создать новую папку</msg>
+  <msg key="create_url">Добавить URL</msg>
+  <msg key="edit_fs_parameters">Редактировать параметры хранилища файлов (ДОПОЛНИТЕЛЬНО)</msg>
+  <msg key="edit_upload_size_limit">Изменить ограничение на размер загружаемых данных</msg>
+  <msg key="item">док.</msg>
+  <msg key="items">документов</msg>
+  <msg key="lt_File_Storage_Administ">Управление хранилищем файлов</msg>
+  <msg key="pretty_name">Документы</msg>
+  <msg key="upload_file">Добавить файл</msg>
+  <msg key="view_details">детали</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.sh_HR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.sh_HR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.sh_HR.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="sh_HR" charset="utf-8">
+
+  <msg key="create_new_folder">Dodaj novi katalog</msg>
+  <msg key="create_url">Dodaj novi URL</msg>
+  <msg key="item">clan</msg>
+  <msg key="items">stavke</msg>
+  <msg key="pretty_name">Dokumenti</msg>
+  <msg key="upload_file">Dodaj fajl</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.sv_SE.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.sv_SE.ISO-8859-1.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="file-storage-includelet"  locale="sv_SE" charset="ISO-8859-1">
+
+  <msg key="byte">byte</msg>
+  <msg key="bytes">bytes</msg>
+  <msg key="create_new_folder">Skapa ny mapp</msg>
+  <msg key="create_url">Skapa URL</msg>
+  <msg key="item">objekt</msg>
+  <msg key="items">objekt</msg>
+  <msg key="pretty_name">Dokument</msg>
+  <msg key="upload_file">Ladda upp fil</msg>
+  <msg key="view_details">se detaljer</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.th_TH.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.th_TH.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.th_TH.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="th_TH" charset="utf-8">
+
+  <msg key="create_new_folder">สร้างแฟ้มใหม่</msg>
+  <msg key="create_url">สร้าง URL</msg>
+  <msg key="items">รายการ</msg>
+  <msg key="pretty_name">เอกสาร</msg>
+  <msg key="upload_file">Upload เอกสาร</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.tr_TR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.tr_TR.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="tr_TR" charset="utf-8">
+
+  <msg key="create_new_folder">Yeni bir dizin yarat</msg>
+  <msg key="create_url">Bir URL yarat</msg>
+  <msg key="pretty_name">Dökümanlar</msg>
+  <msg key="upload_file">Bir dosya yükle</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.zh_CN.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.zh_CN.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.zh_CN.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="zh_CN" charset="utf-8">
+
+  <msg key="advanced">(&lt;font=red&gt;高级&lt;/font&gt;)</msg>
+  <msg key="byte">字节</msg>
+  <msg key="bytes">字节</msg>
+  <msg key="create_new_folder">创建新文件夹</msg>
+  <msg key="create_url">创建URL</msg>
+  <msg key="edit_fs_parameters">编辑文件存储参数(高级)</msg>
+  <msg key="edit_upload_size_limit">编辑上传限制</msg>
+  <msg key="item">项</msg>
+  <msg key="items">项</msg>
+  <msg key="lt_File_Storage_Administ">文件存储管理</msg>
+  <msg key="pretty_name">文件</msg>
+  <msg key="upload_file">上传文件</msg>
+  <msg key="view_details">查看详细信息</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.zh_TW.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/catalog/file-storage-includelet.zh_TW.utf-8.xml	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="file-storage-includelet"  locale="zh_TW" charset="utf-8">
+
+  <msg key="create_new_folder">建立新的資料夾</msg>
+  <msg key="create_url">新增URL</msg>
+  <msg key="items">項目</msg>
+  <msg key="pretty_name">文件</msg>
+  <msg key="upload_file">上傳檔案</msg>
+</message_catalog>
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-admin-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-admin-includelet.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-admin-includelet.adp	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,4 @@
+<ul>
+  <li><a href="file-storage/admin/upload-size-limit?<%=[export_url_vars return_url]%>" title="#file-storage-includelet.edit_upload_size_limit#">#file-storage-includelet.edit_upload_size_limit#</a>
+  <if @show_fs_url_p@ eq 1><li><a href="@fs_url@" title="#file-storage-includelet.edit_fs_parameters#">#file-storage-includelet.edit_fs_parameters#</a></li></if>
+</ul>
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-admin-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-admin-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-admin-includelet.tcl	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,19 @@
+ad_page_contract {
+
+    The display logic for the file storage admin includelet.
+
+    @author yon (yon@openforce.net)
+    @creation-date 2002-05-13
+    @version $Id: file-storage-admin-includelet.tcl,v 1.1 2008/07/30 11:51:15 donb Exp $
+
+}
+
+set return_url [ns_conn url]
+
+set user_id [ad_conn user_id]
+
+ad_return_template
+
+set package_id [site_node_apm_integration::get_child_package_id -package_key "file-storage"]
+set fs_url "/shared/parameters?[export_url_vars package_id return_url]"
+set show_fs_url_p [parameter::get_from_package_key -parameter ShowParametersLinkP -package_key file-storage-includelet -default 1]
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet-oracle.xql	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="select_folder_contents">
+        <querytext>
+            select file_storage.get_package_id(fs_objects.object_id) as package_id,
+                   decode(fs_objects.type, 'url', (select site_node.url(site_nodes.node_id)
+                                                   from site_nodes
+                                                   where site_nodes.object_id = file_storage.get_package_id(fs_objects.parent_id)),
+                                           (select site_node.url(site_nodes.node_id)
+                                            from site_nodes
+                                            where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
+                   fs_objects.object_id,
+		   fs_objects.file_upload_name,
+                   fs_objects.name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.content_size
+            from fs_objects
+            where fs_objects.parent_id in ([join $list_of_folder_ids ", "])
+            and 't' = acs_permission.permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.parent_id,
+                     fs_objects.sort_key,
+                     fs_objects.name
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet-postgresql.xql	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="select_folder_contents">
+        <querytext>
+            select file_storage__get_package_id(fs_objects.object_id) as package_id,
+                   (CASE 
+                       WHEN fs_objects.type = 'url'
+                       THEN (select site_node__url(site_nodes.node_id)
+                                                   from site_nodes
+                                                   where site_nodes.object_id = file_storage__get_package_id(fs_objects.parent_id))
+                       ELSE (select site_node__url(site_nodes.node_id)
+                                            from site_nodes
+                                            where site_nodes.object_id = file_storage__get_package_id(fs_objects.object_id))
+                   END) as url,
+                   fs_objects.object_id,
+                   fs_objects.file_upload_name,
+                   fs_objects.name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.content_size
+            from fs_objects
+            where fs_objects.parent_id in ([join $list_of_folder_ids ", "])
+            and 't' = acs_permission__permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.parent_id,
+                     fs_objects.sort_key,
+                     fs_objects.name
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet.adp	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,5 @@
+<include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@root_folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
+<p>@notification_chunk;noquote@</p>
+<if @webdav_url@ not nil>
+      <p>#file-storage.Folder_available_via_WebDAV_at#</p>
+</if>
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-contents-includelet.tcl	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,50 @@
+ad_page_contract {
+    The display logic for the fs contents includelet. 
+
+    These includelets show the contents of the given folder in a table 
+
+    re-using a lot of code from file-storage-includelet
+
+    @author Arjun Sanyal (arjun@openforce.net)
+    @version $Id: file-storage-contents-includelet.tcl,v 1.1 2008/07/30 11:51:15 donb Exp $
+
+}
+
+set user_id [ad_conn user_id]
+set list_of_folder_ids $folder_id
+set n_folders [llength $list_of_folder_ids]
+set file_storage_package_id $package_id
+
+if {$n_folders != 1} {
+    # something went wrong, we can't have more than one folder here
+    ad_return -error
+}
+
+set root_folder_id [fs::get_root_folder -package_id $file_storage_package_id]
+
+set folder_id [lindex $list_of_folder_ids 0]
+set scope_fs_url "/packages/file-storage/www/folder-chunk"
+set n_past_days ""
+set url [site_node_object_map::get_url -object_id $folder_id]
+set recurse_p 1
+set contents_url "${url}folder-contents?[export_vars {folder_id recurse_p}]&"
+
+# Enable Notifications
+
+set folder_name [fs_get_folder_name $folder_id]
+set notification_chunk [notification::display::request_widget \
+    -type fs_fs_notif \
+    -object_id $folder_id \
+    -pretty_name $folder_name \
+    -url [ad_conn url]?folder_id=$folder_id \
+    ]
+
+if [exists_and_not_null file_storage_package_id] {
+    set use_webdav_p  [parameter::get -package_id $file_storage_package_id -parameter "UseWebDavP"]
+    
+    if { $use_webdav_p == 1} { 
+	set webdav_url [fs::webdav_url -item_id $folder_id -package_id $file_storage_package_id]
+    }
+}
+
+ad_return_template 
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-includelet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-includelet-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-includelet-oracle.xql	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="select_folders">
+        <querytext>
+            select file_storage.get_package_id(fs_objects.object_id) as package_id,
+                   decode(fs_objects.type, 'url', (select site_node.url(site_nodes.node_id)
+                                                   from site_nodes
+                                                   where site_nodes.object_id = file_storage.get_package_id(fs_objects.parent_id)),
+                                           (select site_node.url(site_nodes.node_id)
+                                            from site_nodes
+                                            where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
+                   fs_objects.object_id,
+                   fs_objects.name,
+		   fs_objects.file_upload_name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.content_size
+            from fs_objects
+            where fs_objects.object_id in ([join $list_of_folder_ids ", "])
+            and 't' = acs_permission.permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.sort_key,
+                     fs_objects.name
+        </querytext>
+    </fullquery>
+
+    <fullquery name="select_folder_contents">
+        <querytext>
+            select file_storage.get_package_id(fs_objects.object_id) as package_id,
+                   decode(fs_objects.type, 'url', (select site_node.url(site_nodes.node_id)
+                                                   from site_nodes
+                                                   where site_nodes.object_id = file_storage.get_package_id(fs_objects.parent_id)),
+                                           (select site_node.url(site_nodes.node_id)
+                                            from site_nodes
+                                            where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
+                   fs_objects.object_id,
+                   fs_objects.name,
+		   fs_objects.file_upload_name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.content_size
+            from fs_objects
+            where fs_objects.parent_id in ([join $list_of_folder_ids ", "])
+            and 't' = acs_permission.permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.parent_id,
+                     fs_objects.sort_key,
+                     fs_objects.name
+        </querytext>
+    </fullquery>
+
+</queryset>
+
+
+
+
+
+
+
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-includelet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-includelet-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-includelet-postgresql.xql	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="select_folders">
+        <querytext>
+            select file_storage__get_package_id(fs_objects.object_id) as package_id,
+                   (CASE 
+                       WHEN fs_objects.type = 'url'
+                       THEN (select site_node__url(site_nodes.node_id)
+                                                   from site_nodes
+                                                   where site_nodes.object_id = file_storage__get_package_id(fs_objects.parent_id))
+                       ELSE (select site_node__url(site_nodes.node_id)
+                                            from site_nodes
+                                            where site_nodes.object_id = file_storage__get_package_id(fs_objects.object_id))
+                   END) as url,
+                   fs_objects.object_id,
+                   fs_objects.name,
+                   fs_objects.file_upload_name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.content_size
+            from fs_objects
+            where fs_objects.object_id in ([join $list_of_folder_ids ", "])
+            and 't' = acs_permission__permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.sort_key,
+                     fs_objects.name
+        </querytext>
+    </fullquery>
+
+    <fullquery name="select_folder_contents">
+        <querytext>
+            select file_storage__get_package_id(fs_objects.object_id) as package_id,
+                   (CASE
+                      WHEN fs_objects.type = 'url'
+                      THEN (select site_node__url(site_nodes.node_id)
+                                                   from site_nodes
+                                                   where site_nodes.object_id = file_storage__get_package_id(fs_objects.parent_id))
+                      ELSE (select site_node__url(site_nodes.node_id)
+                                            from site_nodes
+                                            where site_nodes.object_id = file_storage__get_package_id(fs_objects.object_id))
+                   END) as url,
+                   fs_objects.object_id,
+                   fs_objects.name,
+                   fs_objects.file_upload_name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.content_size
+            from fs_objects
+            where fs_objects.parent_id in ([join $list_of_folder_ids ", "])
+            and 't' = acs_permission__permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.parent_id,
+                     fs_objects.sort_key,
+                     fs_objects.name
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-includelet.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-includelet.adp	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,23 @@
+<if @scoped_p@ eq 1>
+<include src=@scope_fs_url@ folder_id=@folder_id@ root_folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@" page_num="@page_num@">
+</if>
+
+<else>
+
+<if @write_p@ true>
+	<div class="list-button-bar-top">
+		<a href="@url@folder-create?parent_id=@folder_id@" class="button" title="#file-storage-includelet.create_new_folder#">#file-storage-includelet.create_new_folder#</a>
+		<a href="@url@file-add?folder_id=@folder_id@" class="button" title="#file-storage-includelet.upload_file#">#file-storage-includelet.upload_file#</a>
+		<a href="@url@simple-add?folder_id=@folder_id@" class="button" title="#file-storage-includelet.create_url#">#file-storage-includelet.create_url#</a>
+	</div>
+
+</if>
+  <listtemplate name="folders"></listtemplate>
+</else>
+
+<p>@notification_chunk;noquote@</p>
+
+<if @webdav_url@ not nil>
+      <p>#file-storage.Folder_available_via_WebDAV_at#</p>
+</if>
+
Index: openacs-4/packages/file-storage-includelet/lib/file-storage-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/lib/file-storage-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/lib/file-storage-includelet.tcl	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,145 @@
+ad_page_contract {
+    The display logic for the fs includelet
+
+    @author yon (yon@openforce.net)
+    @author Arjun Sanyal (arjun@openforce.net)
+    @cvs_id $Id: file-storage-includelet.tcl,v 1.1 2008/07/30 11:51:15 donb Exp $
+} -query {
+    {n_past_days "99999"}
+    {page_num ""}
+} -properties {
+    user_id:onevalue
+    user_root_folder:onevalue
+    user_root_folder_present_p:onevalue
+    write_p:onevalue
+    admin_p:onevalue
+    delete_p:onevalue
+    url:onevalue
+    folders:multirow
+    n_folders:onevalue
+}
+
+set user_id [ad_conn user_id]
+set list_of_folder_ids $folder_id
+set n_folders [llength $list_of_folder_ids]
+
+set folder_id [lindex $list_of_folder_ids 0]
+set file_storage_node_id [site_node::get_node_id_from_object_id \
+                             -object_id [ad_conn package_id]]
+set file_storage_package_id [site_node::get_children \
+                                -package_key file-storage \
+                                -node_id $file_storage_node_id \
+                                -element package_id]
+
+set url [site_node_object_map::get_url -object_id $folder_id]
+
+set recurse_p 1
+set contents_url "${url}folder-contents?[export_vars {folder_id recurse_p}]&"
+
+set admin_p [permission::permission_p -object_id $folder_id -privilege "admin"]
+set write_p $admin_p
+if {!$write_p} {
+    set write_p [permission::permission_p -object_id $folder_id -privilege "write"]
+}
+set delete_p $admin_p
+if {!$delete_p} {
+    set delete_p [permission::permission_p -object_id $folder_id -privilege "delete"]
+}
+
+set query "select_folders"
+
+template::list::create -name folders -multirow folders -key forum_id -pass_properties {} \
+    -elements {
+	icon {
+	    label ""
+	    display_template {
+		<if @folders.type@ eq "folder">
+		  <a href="@folders.url@?folder_id=@folders.object_id@">
+		  <img border="0" src="/resources/file-storage/folder.gif" height="16" width="16" alt="#file-storage.Folder#">
+                  </a> 
+		</if>
+		<elseif @folders.type@ eq "url">
+		    <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif" alt="#file-storage.File#"></a>
+		</elseif>
+		<else>
+		   <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">
+		   <img border="0" src="/resources/file-storage/file.gif" alt="#file-storage.File#"></a>
+		</else>
+	    }
+	}
+	name {
+	    label ""
+	    display_template {
+		<if @folders.type@ eq "folder">
+		  <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a>		
+		</if>
+		<elseif @folders.type@ eq "url">
+		  <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
+		</elseif>
+		<else>
+		   <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a>
+		</else>
+	    }
+	}
+	type {
+	    label ""
+	    display_template {
+		<if @folders.type@ eq "folder">
+		  #file-storage.folder_type_pretty_name#
+		</if>
+		<else>
+		   @folders.type@
+		</else>
+	    }
+	}
+	size {
+	    label ""
+	    display_template {
+		<if @folders.type@ eq "folder">
+		  <if @folders.content_size@ eq 0>
+		    0 #file-storage-includelet.items#
+		  </if>
+		  <elseif @folders.content_size@ gt 1>
+		    @folders.content_size@ #file-storage-includelet.items#
+		  </elseif>
+	          <else>
+                    @folders.content_size@ #file-storage-includelet.item#
+		  </else>
+		</if>
+		<elseif @folders.type@ eq "url">
+		   <i>n/a</i>
+		</elseif>
+		<else>
+		   @folders.content_size@ <if @folders.content_size eq 1>#file-storage-includelet.byte#</if><else>#file-storage-includelet.bytes#</else>
+		   \[<a href="@folders.url@file?file_id=@folders.object_id@">#file-storage-includelet.view_details#</a>\]
+		</else>
+	    }
+	}
+    }
+
+db_multirow folders $query {
+    # The name of the folder may contain message keys that need to be localized on the fly
+    set name [lang::util::localize $name]
+}
+
+# Enable Notifications
+
+set folder_name [fs_get_folder_name $folder_id]
+set notification_chunk [notification::display::request_widget \
+    -type fs_fs_notif \
+    -object_id $folder_id \
+    -pretty_name $folder_name \
+    -url [ad_conn url]?[ad_conn query]&folder_id=$folder_id \
+    ]
+
+if [exists_and_not_null file_storage_package_id] {
+    set use_webdav_p  [parameter::get -package_id $file_storage_package_id -parameter "UseWebDavP"]
+    
+    if { $use_webdav_p == 1} { 
+	set webdav_url [fs::webdav_url -item_id $folder_id -package_id $file_storage_package_id]
+        regsub -all {/\$} $webdav_url {/\\$} webdav_url
+    }
+}
+
+
+ad_return_template 
Index: openacs-4/packages/file-storage-includelet/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/tcl/apm-callback-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/tcl/apm-callback-procs.tcl	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,56 @@
+ad_library {
+
+    Forums Portlet Install library
+
+    Procedures that deal with installing, instantiating, mounting.
+
+    @creation-date 2003-12-31
+    @author Don Baccus <dhogaza@pacifier.com>
+    @cvs-id 
+}
+
+namespace eval file_storage_includelet::install {}
+
+ad_proc -private file_storage_includelet::install::package_install {} {
+    Package installation callback proc
+} {
+
+    db_transaction {
+
+        # admin includelet
+        layout::includelet::new \
+            -name file_storage_admin_includelet \
+            -description #file-storage-includelet.admin_pretty_name# \
+            -title #file-storage-includelet.admin_pretty_name# \
+            -application file-storage \
+            -template /packages/file-storage-includelet/lib/file-storage-admin-includelet \
+            -initializer file_storage_includelet::initialize \
+            -required_privilege admin
+
+        # contents includelet
+        layout::includelet::new \
+            -name file_storage_contents_includelet \
+            -description #file-storage-includelet.content_pretty_name# \
+            -title #file-storage-includelet.content_pretty_name# \
+            -application file-storage \
+            -template /packages/file-storage-includelet/lib/file-storage-contents-includelet \
+            -initializer file_storage_includelet::initialize
+
+        # User includelet
+        layout::includelet::new \
+            -name file_storage_includelet \
+            -description #file-storage-includelet.pretty_name# \
+            -title #file-storage-includelet.pretty_name# \
+            -application file-storage \
+            -template /packages/file-storage-includelet/lib/file-storage-includelet \
+            -initializer file_storage_includelet::initialize
+    }
+}
+
+ad_proc -private file_storage_includelet::install::package_uninstall {} {
+    Package uninstallation callback proc
+} {
+    layout::includelet::delete -name file_storage_admin_includelet
+    layout::includelet::delete -name file_storage_includelet
+    layout::includelet::delete -name file_storage_contents_includelet
+}
Index: openacs-4/packages/file-storage-includelet/tcl/file-storage-includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage-includelet/tcl/file-storage-includelet-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/file-storage-includelet/tcl/file-storage-includelet-procs.tcl	30 Jul 2008 11:51:15 -0000	1.1
@@ -0,0 +1,23 @@
+namespace eval file_storage_includelet {}
+
+ad_proc -public file_storage_includelet::initialize {
+    element_id
+} {
+    The default behavior of the file storage includelet is to just wrap
+    the file storage package.  Which means we display the root folder for the
+    file storage instance we're associated with.
+} {
+
+    set package_id [layout::element::get_column_value \
+                     -element_id $element_id \
+                     -column package_id] 
+
+    set folder_id [fs::get_root_folder -package_id $package_id]
+    set node_id [site_node::get_node_id_from_object_id -object_id $package_id]
+    site_node_object_map::new -object_id $folder_id -node_id $node_id
+
+    layout::element::parameter::set_values \
+        -element_id $element_id \
+        -parameters [list scoped_p t folder_id $folder_id]
+
+}
Index: openacs-4/packages/forums-includelet/forums-includelet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/forums-includelet.info,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/forums-includelet.info	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!-- Generated by the OpenACS Package Manager -->
+
+<package key="forums-includelet" url="http://openacs.org/repository/apm/packages/forums-includelets" type="apm_service">
+    <package-name>Forums Includelet</package-name>
+    <pretty-plural>Forums Includelet</pretty-plural>
+    <initial-install-p>f</initial-install-p>
+    <singleton-p>t</singleton-p>
+
+    <version name="1.0" url="http://openacs.org/repository/download/apm/forums-includelet-1.0.apm">
+        <owner url="http://openacs.org">OpenACS</owner>
+        <release-date>2008-07-16</release-date>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+
+        <provides url="forums-includelet" version="1.0"/>
+        <requires url="forums" version="1.2.0d3"/>
+        <requires url="layout-manager" version="1.0"/>
+
+        <callbacks>
+            <callback type="after-install"  proc="forums_includelet::install::package_install"/>
+            <callback type="after-upgrade"  proc="forums_includelet::install::after_upgrade"/>
+        </callbacks>
+
+        <parameters>
+        </parameters>
+
+    </version>
+</package>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ar_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ar_EG.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ar_EG.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="ar_EG" charset="utf-8">
+
+  <msg key="admin_pretty_name">إدارةُ منتديات</msg>
+  <msg key="disabled">عُطَّل</msg>
+  <msg key="Forum">المنتدى</msg>
+  <msg key="lt_There_should_be_only_">يجب أن يكون هناك مثال واحد فقط من المنتديات لأغراض الإدارة</msg>
+  <msg key="New">!جديد</msg>
+  <msg key="New_Forum">منتدى جديد</msg>
+  <msg key="No_Forums">لا منتديات</msg>
+  <msg key="pretty_name">المنتديات</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ar_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ar_LB.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ar_LB.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="ar_LB" charset="utf-8">
+
+  <msg key="admin_pretty_name">إدارةُ منتديات</msg>
+  <msg key="disabled">عُطَّل</msg>
+  <msg key="Forum">المنتدى</msg>
+  <msg key="lt_There_should_be_only_">يجب أن يكون هناك مثال واحد فقط من المنتديات لأغراض الإدارة</msg>
+  <msg key="New">جديد!</msg>
+  <msg key="New_Forum">منتدى جديد</msg>
+  <msg key="No_Forums">لا منتديات</msg>
+  <msg key="pretty_name">المنتديات</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ast_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ast_ES.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="ast_ES" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Alministraci�n de Tableros</msg>
+  <msg key="disabled">Desactiv�u</msg>
+  <msg key="Forum">Tableru</msg>
+  <msg key="lt_There_should_be_only_">Solo tien qu'haber una instancia de Tableros no que cinca a l'alministraci�n</msg>
+  <msg key="New">Nuevo</msg>
+  <msg key="New_Forum">Tableru Nuevu</msg>
+  <msg key="No_Forums">Nun hai Tableros</msg>
+  <msg key="pretty_name">Tableros</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ca_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ca_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ca_ES.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="ca_ES" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administraci� de f�rums</msg>
+  <msg key="disabled">desactivat</msg>
+  <msg key="Forum">F�rum</msg>
+  <msg key="lt_There_should_be_only_">Ha d'haver nom�s una inst�ncia de f�rums pel que fa a administraci�</msg>
+  <msg key="New">Nou!</msg>
+  <msg key="New_Forum">F�rum nou</msg>
+  <msg key="No_Forums">Cap f�rum</msg>
+  <msg key="pretty_name">F�rums</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ch_zh.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ch_zh.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet" locale="ch_zh" charset="utf-8">
+
+  <msg key="admin_pretty_name">论坛管理</msg>
+  <msg key="disabled">不能的</msg>
+  <msg key="Forum">论坛</msg>
+  <msg key="lt_There_should_be_only_">以管理为目的的论坛只能有一个</msg>
+  <msg key="New">新！</msg>
+  <msg key="New_Forum">新论坛</msg>
+  <msg key="No_Forums">没有论坛</msg>
+  <msg key="pretty_name">论坛</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.da_DK.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.da_DK.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="da_DK" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administration af Fora</msg>
+  <msg key="disabled">deaktiveret</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Af administrationshensyn b�r der kun v�re �n instans af &quot;forums&quot;</msg>
+  <msg key="New">Ny!</msg>
+  <msg key="New_Forum">Nyt Forum</msg>
+  <msg key="No_Forums">Ingen grupper</msg>
+  <msg key="pretty_name">Diskussionsgrupper</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.de_DE.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.de_DE.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="de_DE" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Diskussionsforen verwalten</msg>
+  <msg key="disabled">Deaktiviert</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Aus verwaltungstechnischen Gr�nden sollten die Diskussionsforen innerhalb einer Gruppe nur einmal eingesetzt werden.</msg>
+  <msg key="New">Neu</msg>
+  <msg key="New_Forum">Neues Forum erstellen</msg>
+  <msg key="No_Forums">Keine Diskussionsforen vorhanden</msg>
+  <msg key="pretty_name">Diskussionsforen</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.el_GR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.el_GR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.el_GR.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="el_GR" charset="utf-8">
+
+  <msg key="disabled">απενεργοποιημένο</msg>
+  <msg key="Forum">Ομάδα συζήτησης</msg>
+  <msg key="New">Νέο!</msg>
+  <msg key="No_Forums">Δεν υπάρχουν διαθέσιμες ομάδες συζήτησης</msg>
+  <msg key="pretty_name">Ομάδες Συζήτησης</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.en_AU.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.en_AU.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.en_AU.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="en_AU" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Forums Administration</msg>
+  <msg key="disabled">disabled</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">There should be only one instance of forums for admin purposes</msg>
+  <msg key="New">New!</msg>
+  <msg key="New_Forum">New Forum</msg>
+  <msg key="No_Forums">No Forums</msg>
+  <msg key="pretty_name">Forums</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.en_US.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.en_US.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="en_US" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Forums Administration</msg>
+  <msg key="disabled">disabled</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="goto_forums_name">Go to forum %forums.name%</msg>
+  <msg key="lt_There_should_be_only_">There should be only one instance of forums for admin purposes</msg>
+  <msg key="New">New!</msg>
+  <msg key="New_Forum">New Forum</msg>
+  <msg key="No_Forums">No Forums</msg>
+  <msg key="pretty_name">Forums</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.es_CO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.es_CO.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.es_CO.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="es_CO" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administraci�n de foros</msg>
+  <msg key="disabled">desactivado</msg>
+  <msg key="Forum">Foro</msg>
+  <msg key="lt_There_should_be_only_">Debe existir una s�la instancia de foros para prop�sitos administrativos</msg>
+  <msg key="New">�Nuevo!</msg>
+  <msg key="New_Forum">Nuevo Foro</msg>
+  <msg key="No_Forums">Sin Foros</msg>
+  <msg key="pretty_name">Foros</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.es_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.es_ES.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="es_ES" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administraci�n de foros</msg>
+  <msg key="disabled">desactivado</msg>
+  <msg key="Forum">Foro</msg>
+  <msg key="goto_forums_name">Ir al foro %forums.name%</msg>
+  <msg key="lt_There_should_be_only_">Debe existir una s�la instancia de foros en cuanto a administraci�n</msg>
+  <msg key="New">�Nuevo!</msg>
+  <msg key="New_Forum">Foro nuevo</msg>
+  <msg key="No_Forums">Sin Foros</msg>
+  <msg key="pretty_name">Foros</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.es_GT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.es_GT.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.es_GT.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="es_GT" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administraci�n de foros</msg>
+  <msg key="disabled">desactivado</msg>
+  <msg key="Forum">Foro</msg>
+  <msg key="lt_There_should_be_only_">Debe existir una s�la instancia de foros para prop�sitos administrativos</msg>
+  <msg key="New">�Nuevo!</msg>
+  <msg key="New_Forum">Nuevo Foro</msg>
+  <msg key="No_Forums">Sin Foros</msg>
+  <msg key="pretty_name">Foros</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.fi_FI.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.fi_FI.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="fi_FI" charset="utf-8">
+
+  <msg key="admin_pretty_name">Keskusteluryhmien ylläpito</msg>
+  <msg key="disabled">poissa käytöstä</msg>
+  <msg key="Forum">Keskusteluryhmä</msg>
+  <msg key="lt_There_should_be_only_">Ylläpitotarkoitusta varten pitäisi olla ainoastaan yksi keskusteluryhmä</msg>
+  <msg key="New">Uusi!</msg>
+  <msg key="New_Forum">Uusi keskusteluryhmä</msg>
+  <msg key="No_Forums">Ei ryhmiä</msg>
+  <msg key="pretty_name">Keskusteluryhmät</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.fr_FR.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.fr_FR.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="fr_FR" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administration de forums</msg>
+  <msg key="disabled">d�sactiv�</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Il ne doit y avoir qu'une seule instance de forums en ce qui concerne l'administration</msg>
+  <msg key="New">Nouveau!</msg>
+  <msg key="New_Forum">Nouveau forum</msg>
+  <msg key="No_Forums">Aucun forum</msg>
+  <msg key="pretty_name">Forums</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.gl_ES.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.gl_ES.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="gl_ES" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administraci�n dos F�rums</msg>
+  <msg key="disabled">desactivado</msg>
+  <msg key="Forum">F�rum</msg>
+  <msg key="lt_There_should_be_only_">Debe haber somente unha instancia de f�rums para prop�sitos administrativos</msg>
+  <msg key="New">Novo!</msg>
+  <msg key="New_Forum">Novo F�rum</msg>
+  <msg key="No_Forums">Ning�n F�rum</msg>
+  <msg key="pretty_name">F�rums</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.hi_IN.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.hi_IN.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.hi_IN.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="hi_IN" charset="utf-8">
+
+  <msg key="admin_pretty_name">मन्च का प्रशासन </msg>
+  <msg key="disabled">विकलान्ग </msg>
+  <msg key="Forum">मन्च</msg>
+  <msg key="lt_There_should_be_only_">मन्च का प्रबन्धन प्रयोजन के लिए ही वहा अकेला एक  अनुरोध होना चाहिए ।     </msg>
+  <msg key="New">नया !  </msg>
+  <msg key="New_Forum">नया मन्च  </msg>
+  <msg key="No_Forums">मन्च नही हे </msg>
+  <msg key="pretty_name">मन्च </msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.hu_HU.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.hu_HU.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="hu_HU" charset="utf-8">
+
+  <msg key="No_Forums">Nincsenek fórumok.</msg>
+  <msg key="pretty_name">fórumok</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.it_IT.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.it_IT.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="it_IT" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Amministrazione dei Forum</msg>
+  <msg key="disabled">disabilitato</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Ci dovrebbe essere un'unica istanza di forum per scopi amministrativi</msg>
+  <msg key="New">Nuovo!</msg>
+  <msg key="New_Forum">Nuovo Forum</msg>
+  <msg key="No_Forums">Nessun Forum</msg>
+  <msg key="pretty_name">Forum</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ja_JP.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ja_JP.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="ja_JP" charset="utf-8">
+
+  <msg key="No_Forums">フォーラムはありません</msg>
+  <msg key="pretty_name">フォーラム</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ko_KR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ko_KR.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="ko_KR" charset="utf-8">
+
+  <msg key="admin_pretty_name">포럼 관리</msg>
+  <msg key="disabled">사용불가능한</msg>
+  <msg key="Forum">포럼</msg>
+  <msg key="lt_There_should_be_only_">관리 목적으로 포럼의 인스턴스는 한개만이 가능합니다.</msg>
+  <msg key="New">새로운!</msg>
+  <msg key="New_Forum">새로운 포럼</msg>
+  <msg key="No_Forums">등록된 포럼이 없습니다.</msg>
+  <msg key="pretty_name">포럼</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ms_MY.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ms_MY.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ms_MY.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="ms_MY" charset="utf-8">
+
+  <msg key="admin_pretty_name">Penyeliaan Forum</msg>
+  <msg key="disabled">dilumpuhkan</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Sepatutnya terdapat hanya satu keadan forum-forum untuk kegunaan pentadbir</msg>
+  <msg key="New">Baru!</msg>
+  <msg key="New_Forum">Forum Baru</msg>
+  <msg key="No_Forums">Tiada Forum</msg>
+  <msg key="pretty_name">Forum-Forum</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.nl_NL.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.nl_NL.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="nl_NL" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Forum administratie</msg>
+  <msg key="disabled">uitgeschakeld</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Voor administratiedoeleinden mag er slechts ��n instance van forums zijn.</msg>
+  <msg key="New">Nieuw! </msg>
+  <msg key="New_Forum">Nieuw forum</msg>
+  <msg key="No_Forums">Geen forums beschikbaar</msg>
+  <msg key="pretty_name">Forums</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.nn_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.nn_NO.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.nn_NO.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="nn_NO" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Forumadministrasjon</msg>
+  <msg key="disabled">avsl�tt</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Det b�r berre vere eit forum for administrasjonsform�l</msg>
+  <msg key="New">Ny!</msg>
+  <msg key="New_Forum">Nytt forum</msg>
+  <msg key="No_Forums">Ingen forum</msg>
+  <msg key="pretty_name">Diskusjonsforum</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.no_NO.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.no_NO.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="no_NO" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Forumadministrasjon</msg>
+  <msg key="disabled">avsl�tt</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Det b�r bare v�re ett forum for administrasjonsform�l</msg>
+  <msg key="New">Ny!</msg>
+  <msg key="New_Forum">Nytt forum</msg>
+  <msg key="No_Forums">Ingen forum</msg>
+  <msg key="pretty_name">Forum</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.pa_IN.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.pa_IN.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.pa_IN.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="pa_IN" charset="utf-8">
+
+  <msg key="No_Forums">ਕੋਈ ਫੋਰਮ ਨਹੀਂ</msg>
+  <msg key="pretty_name">ਫੋਰਮ</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.pl_PL.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.pl_PL.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="pl_PL" charset="utf-8">
+
+  <msg key="admin_pretty_name">Administracja Forum</msg>
+  <msg key="disabled">wyłączone</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Powinno być tylko jedno forum do celów administracyjnych</msg>
+  <msg key="New">Nowy!</msg>
+  <msg key="New_Forum">Nowe Forum</msg>
+  <msg key="No_Forums">Brak Forum</msg>
+  <msg key="pretty_name">Biuletyny</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.pt_BR.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.pt_BR.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="pt_BR" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administra��o dos F�rums</msg>
+  <msg key="disabled">desativado</msg>
+  <msg key="Forum">F�rum</msg>
+  <msg key="lt_There_should_be_only_">Deve haver somente uma inst�ncia de f�rums para prop�sitos administrativos</msg>
+  <msg key="New">Novo!</msg>
+  <msg key="New_Forum">Novo F�rum</msg>
+  <msg key="No_Forums">Nenhum F�rum</msg>
+  <msg key="pretty_name">F�runs de Discuss�o</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.pt_PT.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.pt_PT.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="pt_PT" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administra��o dos Forums</msg>
+  <msg key="disabled">desactivado</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Deve haver apenas uma inst�ncia dos forums para prop�sitos de administra��o</msg>
+  <msg key="New">Novo!</msg>
+  <msg key="New_Forum">Novo Forum</msg>
+  <msg key="No_Forums">N�o h� Forums</msg>
+  <msg key="pretty_name">Forums</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ro_RO.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ro_RO.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ro_RO.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="ro_RO" charset="utf-8">
+
+  <msg key="admin_pretty_name">Administrarea Forumurilor</msg>
+  <msg key="disabled">dezactivat</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Ar trebui să fie o singură instalare a forumurilor pentru scopuri administrative</msg>
+  <msg key="New">Nou!</msg>
+  <msg key="New_Forum">Forum Nou</msg>
+  <msg key="No_Forums">Nu sunt Forumuri</msg>
+  <msg key="pretty_name">Forumuri</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.ru_RU.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.ru_RU.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="ru_RU" charset="utf-8">
+
+  <msg key="admin_pretty_name">Администрирование форумов</msg>
+  <msg key="disabled">запрещен</msg>
+  <msg key="Forum">Форум</msg>
+  <msg key="lt_There_should_be_only_">Нужна всего одна виртуальная копия Форумов, для целей администрирования</msg>
+  <msg key="New">Новый!</msg>
+  <msg key="New_Forum">Новый форум</msg>
+  <msg key="No_Forums">Форумов нет</msg>
+  <msg key="pretty_name">Форумы</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.sh_HR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.sh_HR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.sh_HR.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="sh_HR" charset="utf-8">
+
+  <msg key="No_Forums">Trenutno bez foruma</msg>
+  <msg key="pretty_name">Oglasna tabla</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.sv_SE.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.sv_SE.ISO-8859-1.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="forums-includelet"  locale="sv_SE" charset="ISO-8859-1">
+
+  <msg key="admin_pretty_name">Administration av forum</msg>
+  <msg key="disabled">avst�ngd</msg>
+  <msg key="Forum">Forum</msg>
+  <msg key="lt_There_should_be_only_">Det skall bara finnas en upps�ttning forum f�r administrativa �ndam�l</msg>
+  <msg key="New">Nytt!</msg>
+  <msg key="New_Forum">Nytt forum</msg>
+  <msg key="No_Forums">Inga forum</msg>
+  <msg key="pretty_name">Forum</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.th_TH.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.th_TH.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.th_TH.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="th_TH" charset="utf-8">
+
+  <msg key="No_Forums">ไม่มีกระทู้</msg>
+  <msg key="pretty_name">กระดานสนทนา</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.tr_TR.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.tr_TR.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="tr_TR" charset="utf-8">
+
+  <msg key="pretty_name">Tartisma gruplari</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.zh_CN.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.zh_CN.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.zh_CN.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="zh_CN" charset="utf-8">
+
+  <msg key="admin_pretty_name">论坛管理</msg>
+  <msg key="disabled">不能</msg>
+  <msg key="Forum">论坛</msg>
+  <msg key="lt_There_should_be_only_">只能有一个管理论坛</msg>
+  <msg key="New">新！</msg>
+  <msg key="New_Forum">新论坛</msg>
+  <msg key="No_Forums">没有论坛</msg>
+  <msg key="pretty_name">论坛</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/catalog/forums-includelet.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/catalog/forums-includelet.zh_TW.utf-8.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/catalog/forums-includelet.zh_TW.utf-8.xml	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message_catalog package_key="forums-includelet"  locale="zh_TW" charset="utf-8">
+
+  <msg key="pretty_name">論壇</msg>
+</message_catalog>
Index: openacs-4/packages/forums-includelet/lib/forums-admin-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/lib/forums-admin-includelet.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/lib/forums-admin-includelet.adp	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,13 @@
+<ul>
+<multiple name="forums">
+  <li>
+    <a href="@url@admin/forum-edit?forum_id=@forums.forum_id@">@forums.name@</a>
+<if @forums.enabled_p@ ne t><b>(#forums-includelet.disabled#)</b></if>
+  </li>
+</multiple>
+</ul>
+<ul>
+  <li>
+    <a href="@url@admin/forum-new?name=@encoded_default_name@">#forums-includelet.New_Forum#</a>
+  </li>
+</ul>
Index: openacs-4/packages/forums-includelet/lib/forums-admin-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/lib/forums-admin-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/lib/forums-admin-includelet.tcl	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,25 @@
+ad_page_contract {
+    The display logic for the forums admin includelet
+    
+    @author Ben Adida (ben@openforce)
+    @cvs_id $Id: forums-admin-includelet.tcl,v 1.1 2008/07/30 11:50:50 donb Exp $
+}
+
+db_multirow forums select_forums {
+    select forum_id, name, enabled_p
+    from forums_forums
+    where package_id = :package_id
+}
+
+set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
+
+set package_id [ad_conn package_id]
+set default_name [db_string select_package_name {
+    select instance_name from apm_packages where package_id= :package_id
+}]
+
+append default_name " [_ forums-includelet.Forum]"
+
+set encoded_default_name [ns_urlencode $default_name]
+
+ad_return_template
Index: openacs-4/packages/forums-includelet/lib/forums-includelet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/lib/forums-includelet-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/lib/forums-includelet-oracle.xql	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="select_forums">
+        <querytext>
+	    select forums_forums.package_id,
+            acs_object.name(apm_package.parent_id(forums_forums.package_id)) as parent_name,
+            (select site_node.url(site_nodes.node_id)
+            from site_nodes
+            where site_nodes.object_id = forums_forums.package_id) as url,
+            forums_forums.forum_id,
+            forums_forums.name,
+            case when last_modified > (sysdate - 1) then 't' else 'f' end as new_p
+            from forums_forums_enabled forums_forums,
+            acs_objects
+            where acs_objects.object_id = forums_forums.forum_id and 
+            forums_forums.package_id = :package_id
+            $private_data_restriction
+             order by parent_name,
+             forums_forums.name
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/forums-includelet/lib/forums-includelet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/lib/forums-includelet-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/lib/forums-includelet-postgresql.xql	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="select_forums">
+        <querytext>
+	    select forums_forums.package_id,
+            acs_object__name(apm_package__parent_id(forums_forums.package_id)) as parent_name,
+            (select site_node__url(site_nodes.node_id)
+            from site_nodes
+            where site_nodes.object_id = forums_forums.package_id) as url,
+            forums_forums.forum_id,
+            forums_forums.name,
+            case when last_modified > (cast(current_timestamp as date)- 1) then 't' else 'f' end as new_p
+            from forums_forums_enabled forums_forums,
+            acs_objects
+            where acs_objects.object_id = forums_forums.forum_id and 
+            forums_forums.package_id = :package_id
+            $private_data_restriction
+             order by parent_name,
+             forums_forums.name
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/forums-includelet/lib/forums-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/lib/forums-includelet.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/lib/forums-includelet.adp	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,20 @@
+<if @forums:rowcount@ gt 0>
+  <ul>
+    <multiple name="forums">
+      @forums.parent_name@
+      <li>
+        <a href="@forums.url@forum-view?forum_id=@forums.forum_id@" title="#forums-includelet.goto_forums_name#">@forums.name@</a>
+        <if @forums.new_p@ eq t>
+          <span class="new_flag">
+            <img src="/resources/acs-subsite/new.gif" align="absmiddle" border="0" alt="#forums-includelet.New#" align="baseline">
+          </span>
+        </if>
+      </li>
+    </multiple>
+  </ul>
+</if>
+<else>
+  #forums-includelet.No_Forums#
+</else>
+
+
Index: openacs-4/packages/forums-includelet/lib/forums-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/lib/forums-includelet.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/lib/forums-includelet.tcl	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,13 @@
+# The forums includelet can oly be bound to a single forum package.  If you want
+# the .LRN-style functionality you'll have to write a custom portlet and the binding logic
+# to go with it (the applet functionality).
+
+if { [acs_privacy::privacy_control_enabled_p] } {
+    set private_data_restriction [db_map dbqd.forums-portlet.www.forums-portlet.restrict_by_private_data_priv]
+} else {
+    set private_data_restriction ""
+}
+
+set user_id [ad_conn user_id]
+
+db_multirow forums select_forums {}
Index: openacs-4/packages/forums-includelet/lib/forums-includelet.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/lib/forums-includelet.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/lib/forums-includelet.xql	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+    <fullquery name="restrict_by_private_data_priv">
+        <querytext>
+            and exists (
+                select 1
+                from acs_object_party_privilege_map ppm
+                where ppm.object_id = forums_forums.package_id
+                  and ppm.party_id = :user_id
+                  and ppm.privilege = 'read_private_data'
+            )
+        </querytext>
+    </fullquery>
+</queryset>
Index: openacs-4/packages/forums-includelet/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/tcl/apm-callback-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums-includelet/tcl/apm-callback-procs.tcl	30 Jul 2008 11:50:50 -0000	1.1
@@ -0,0 +1,43 @@
+ad_library {
+
+    Forums includelet for use with the layout manager
+
+    @creation-date 2008-07-16
+    @author Don Baccus <dhogaza@pacifier.com>
+    @version $Id: apm-callback-procs.tcl,v 1.1 2008/07/30 11:50:50 donb Exp $
+}
+
+namespace eval forums_includelet::install {}
+
+ad_proc -private forums_includelet::install::package_install {} {
+    Package installation callback proc
+} {
+
+    db_transaction {
+
+        # Admin includelet
+        layout::includelet::new \
+            -name forums_admin_includelet \
+            -description "Displays forums admin includelet" \
+            -title #forums-includelet.admin_pretty_name# \
+            -application forums \
+            -template /packages/forums-includelet/lib/forums-admin-includelet \
+            -required_privilege admin 
+
+        # User includelet
+        layout::includelet::new \
+            -name forums_includelet \
+            -description "Displays the forums includelet" \
+            -title #forums-includelet.pretty_name# \
+            -application forums \
+            -template /packages/forums-includelet/lib/forums-includelet 
+    }
+}
+
+ad_proc -private forums_includelet::install::package_uninstall {} {
+    Package uninstallation callback proc
+} {
+    layout::includelet::delete -name forums_includelet
+    layout::includelet::delete -name forums_admin_includelet
+}
+