Index: openacs-4/packages/calendar/catalog/calendar.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/Attic/calendar.AR_LB.utf-8.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar/catalog/calendar.AR_LB.utf-8.xml	10 Mar 2004 13:46:45 -0000	1.5
+++ openacs-4/packages/calendar/catalog/calendar.AR_LB.utf-8.xml	6 May 2004 15:21:39 -0000	1.6
@@ -11,8 +11,9 @@
   <msg key="All_Day_Event">حدث طوال النهار</msg>
   <msg key="all_events">كُلّ الأحداث</msg>
   <msg key="and_Time">والوقت</msg>
+  <msg key="Apply_to_all">يطبق علر جميع الآحداث</msg>
   <msg key="Attachments">الملحقات:</msg>
-  <msg key="Audiences_for_item">مُشاهدون للمادةِ</msg>
+  <msg key="Audiences_for_item">مُشاهدون للمادةِ%cal_item_name%</msg>
   <msg key="Calendar">المُفكِرات</msg>
   <msg key="Calendar_Add_Item">المفكرة: أضف بند</msg>
   <msg key="Calendar_Edit_Item">المفكرة: عَدّلْ البند</msg>
Index: openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml	10 Mar 2004 13:46:45 -0000	1.11
+++ openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml	6 May 2004 15:21:39 -0000	1.12
@@ -11,6 +11,7 @@
   <msg key="All_Day_Event">Cita para todo el d�a</msg>
   <msg key="all_events">Todas las citas</msg>
   <msg key="and_Time">y Hora</msg>
+  <msg key="Apply_to_all">Aplicar a todos los eventos</msg>
   <msg key="Attachments">Archivos Adjuntos:</msg>
   <msg key="Audiences_for_item">Audiencia para la cita</msg>
   <msg key="Calendar">Calendario</msg>
@@ -44,6 +45,7 @@
   <msg key="from">de</msg>
   <msg key="Grant">Otorgar</msg>
   <msg key="Grant_Permissions">Autorizar</msg>
+  <msg key="is_recurring">El evento es recurrente</msg>
   <msg key="Item">Cita</msg>
   <msg key="lt_Are_you_sure_you_want">�Desea realmente borrar este calendario? Todos los eventos y permisos asociados ser�n borrados tambi�n.</msg>
   <msg key="lt_Are_you_sure_you_want_1">�Desea realmente borrar este evento?</msg>
@@ -93,6 +95,7 @@
   <msg key="same">cada</msg>
   <msg key="Saturday">S�bado</msg>
   <msg key="Select_Calendars">Elegir Calendarios</msg>
+  <msg key="Sharing">Compartiendo</msg>
   <msg key="Start_Time">Inicio</msg>
   <msg key="Submit_query">Enviar solicitud</msg>
   <msg key="Sunday">Domingo</msg>
Index: openacs-4/packages/calendar/catalog/calendar.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.hu_HU.utf-8.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar/catalog/calendar.hu_HU.utf-8.xml	10 Mar 2004 13:46:45 -0000	1.4
+++ openacs-4/packages/calendar/catalog/calendar.hu_HU.utf-8.xml	6 May 2004 15:21:39 -0000	1.5
@@ -13,6 +13,7 @@
   <msg key="Calendar">Naptár</msg>
   <msg key="Calendar_Add_Item">Naptár: új tétel</msg>
   <msg key="Calendar_Edit_Item">Naptár: tétel szerkesztése</msg>
+  <msg key="Calendar_Item_Types">Naptárbejegyzés-típusok</msg>
   <msg key="Calendar_Name">Naptár neve</msg>
   <msg key="Calendar_Permissions">&quot;Naptár jogosultságok&quot;</msg>
   <msg key="Calendar_Permissions_1">Naptár jogosultságok</msg>
@@ -22,13 +23,17 @@
   <msg key="Date">Dátum:</msg>
   <msg key="Date_1">Dátum</msg>
   <msg key="day">nap</msg>
+  <msg key="day_rolling_period">napos időszak alatt</msg>
   <msg key="day_s">nap(ok)</msg>
   <msg key="Delete">Törlés</msg>
   <msg key="delete">törlés</msg>
   <msg key="Description">Leírás</msg>
   <msg key="Details">Részletek:</msg>
   <msg key="Edit">Szerkesztés</msg>
   <msg key="edit">szerkesztés</msg>
+  <msg key="Events_over_a">Események egy</msg>
   <msg key="Friday">Péntek</msg>
   <msg key="Item">Tétel</msg>
+  <msg key="New_Type">Új típus:</msg>
+  <msg key="No_Items">Nincsenek tételek.</msg>
 </message_catalog>
Index: openacs-4/packages/calendar/catalog/calendar.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.nl_NL.ISO-8859-1.xml,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/calendar/catalog/calendar.nl_NL.ISO-8859-1.xml	10 Mar 2004 13:46:45 -0000	1.12
+++ openacs-4/packages/calendar/catalog/calendar.nl_NL.ISO-8859-1.xml	6 May 2004 15:21:39 -0000	1.13
@@ -7,7 +7,7 @@
   <msg key="Add_a_new_Audience">Een nieuw publiek toevoegen</msg>
   <msg key="add_an_event">Een gebeurtenis toevoegen</msg>
   <msg key="Add_Item">Gebeurtenis toevoegen</msg>
-  <msg key="Add_Recurrence">Herhaling toevoegen</msg>
+  <msg key="Add_Recurrence">Repeterend toevoegen</msg>
   <msg key="All_Day_Event">Gebeurtenis op iedere dag</msg>
   <msg key="all_events">alle gebeurtenissen</msg>
   <msg key="and_Time">en tijd</msg>
@@ -36,11 +36,11 @@
   <msg key="delete">Verwijderen</msg>
   <msg key="Description">Beschrijving</msg>
   <msg key="Details">Details:</msg>
-  <msg key="developer_note_calendar_add">Toelichting voor ontwikkelaars: Een kalender aanmaken omvat de volgende stappen: 
-&lt;ol&gt;
-&lt;li&gt;Maak een kalenderobject aan en wijzig, indien nodig, de standaardrechten.
-&lt;li&gt;Associeer de kalender met groepen en/of gebruikers.
-&lt;li&gt;Wijzig groeps- en gebruikersrechten, indien gewenst.
+  <msg key="developer_note_calendar_add">Toelichting voor ontwikkelaars: Een kalender aanmaken omvat de volgende stappen: 
+&lt;ol&gt;
+&lt;li&gt;Een kalenderobject aanmaken en - indien nodig- de standaardrechten veranderen.&lt;/li&gt;
+&lt;li&gt;De kalender met groepen en/of gebruikers verbinden.&lt;/li&gt;
+&lt;li&gt;De gewenste groeps- en gebruikersrechten toepassen.&lt;/li&gt;
 &lt;/ol&gt;</msg>
   <msg key="Edit">Bewerken</msg>
   <msg key="edit">bewerken</msg>
@@ -50,20 +50,20 @@
   <msg key="from">van</msg>
   <msg key="Grant">Toekennen</msg>
   <msg key="Grant_Permissions">Rechten toekennen</msg>
-  <msg key="is_recurring">Terugkerende gebeurtenis.</msg>
+  <msg key="is_recurring">Repeterende gebeurtenis.</msg>
   <msg key="Item">Gebeurtenis</msg>
-  <msg key="lt_Are_you_sure_you_want">Moet deze kalender echt worden verwijderd?
-
+  <msg key="lt_Are_you_sure_you_want">Deze kalender echt verwijderen?
+
 Alle gebeurtenissen en alle rechten die met deze kalender zijn verbonden zullen ook worden verwijderd. </msg>
-  <msg key="lt_Are_you_sure_you_want_1">Moet deze gebeurtenis echt worden verwijderd?</msg>
+  <msg key="lt_Are_you_sure_you_want_1">Deze gebeurtenis echt verwijderen?</msg>
   <msg key="lt_Audiences_for_calenda">Publiek voor kalender</msg>
   <msg key="lt_Calendar_Administrati">Kalender administratie</msg>
-  <msg key="lt_Calendar_Administrati_1">Kalender administratie van gebruiker</msg>
+  <msg key="lt_Calendar_Administrati_1">Kalender administratie voor gebruiker</msg>
   <msg key="lt_Calendar_Choose_Calen">Kalender: kalender kiezen</msg>
   <msg key="lt_Calendar_detail_listi">Kalender detail: alle informatie over de persoonlijke kalender</msg>
   <msg key="lt_Calendar_Item_Adminis">Gebeurtenis administratie</msg>
   <msg key="lt_Calendar_Item_Permiss">&quot;Rechten van gebeurtenissen&quot;</msg>
-  <msg key="lt_Calendars_Repeating_E">Kalenders: terugkerende gebeurtenis</msg>
+  <msg key="lt_Calendars_Repeating_E">Kalenders: repeterende gebeurtenis</msg>
   <msg key="lt_Create_a_new_calendar">Nieuwe kalender aanmaken </msg>
   <msg key="lt_delete_all_occurrence">alle voorkomende gevallen verwijderen</msg>
   <msg key="lt_delete_only_this_inst">alleen deze instance verwijderen</msg>
@@ -79,7 +79,7 @@
   <msg key="lt_The_following_is_a__l">Dit is een lijst van beschikbare kalenders. Deze lijst is beschikbaar via de persoonlijke kalender, zodat gebeurtenissen tussen twee kalenders kunnen worden ingezien. Men kan zelf aangeven welke kalenders op de lijst moeten blijven en welke niet.</msg>
   <msg key="lt_There_are_no_audience">Deze kalender heeft geen publiek </msg>
   <msg key="lt_This_is_a_repeating_e">Deze gebeurtenis is terugkerend</msg>
-  <msg key="lt_You_are_choosing_to_m">Deze gebeurtenis is als terugkerend ingesteld, zodat deze vaker in de kalender zal verschijnen. De details zijn:</msg>
+  <msg key="lt_You_are_choosing_to_m">Deze gebeurtenis is als repeterend ingesteld, zodat deze vaker in de kalender zal verschijnen. De details zijn:</msg>
   <msg key="lt_You_can_manage_the_fo">De volgende kalenders staan ter beschikking</msg>
   <msg key="lt_You_have_no_party_wid">Er is geen kalender die voor alle gebruikers beschikbaar is.</msg>
   <msg key="Monday">maandag</msg>
Index: openacs-4/packages/calendar/catalog/calendar.nn_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.nn_NO.ISO-8859-1.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/catalog/calendar.nn_NO.ISO-8859-1.xml	6 May 2004 15:21:39 -0000	1.2
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<message_catalog package_key="calendar" package_version="2.0.1" locale="nn_NO" charset="ISO-8859-1">
+
+  <msg key="_You_may_choose_to">. Du kan velje �</msg>
+  <msg key="Add">Legg til</msg>
+  <msg key="add">legg til</msg>
+  <msg key="Add_a_new_Audience">Legg til ei ny gruppe personar</msg>
+  <msg key="add_an_event">legg til avtale</msg>
+  <msg key="Add_Item">Legg inn</msg>
+  <msg key="Add_Recurrence">Legg til repitisjon</msg>
+  <msg key="All_Day_Event">Heile dagen</msg>
+  <msg key="all_events">alle innlegg</msg>
+  <msg key="and_Time">og tid</msg>
+  <msg key="Apply_to_all">Legg inn for alle aktivitetar</msg>
+  <msg key="Attachments">Vedlegg:</msg>
+  <msg key="Audiences_for_item">Kven som kan sj� innlegget %cal_item_name% </msg>
+  <msg key="Calendar">Kalender</msg>
+  <msg key="Calendar_Add_Item">Kalender: Nyt aktivitet</msg>
+  <msg key="Calendar_Edit_Item">Kalender: rediger aktivitet</msg>
+  <msg key="Calendar_Item">Kalenderaktivitet</msg>
+  <msg key="Calendar_Item_Delete">Kalenderinnlegg Slett</msg>
+  <msg key="Calendar_Item_Types">Kalender Innleggstypar</msg>
+  <msg key="Calendar_Name">Kalendernavn</msg>
+  <msg key="Calendar_Permissions">&quot;Rettar for kalender&quot;</msg>
+  <msg key="Calendar_Permissions_1">Rettar for kalender</msg>
+  <msg key="Calendar_Preferences">&quot;Val for kalender&quot;</msg>
+  <msg key="Calendars">Kalendrar</msg>
+  <msg key="Choose">Vel</msg>
+  <msg key="Current_Permissions">Noverande rettar</msg>
+  <msg key="Date">Dato:</msg>
+  <msg key="Date_1">Dato</msg>
+  <msg key="day">dag</msg>
+  <msg key="day_rolling_period">dagars rullande periode</msg>
+  <msg key="day_s">dag(ar)</msg>
+  <msg key="Delete">Slett</msg>
+  <msg key="delete">slett</msg>
+  <msg key="Description">Beskriving</msg>
+  <msg key="Details">Detaljar:</msg>
+  <msg key="developer_note_calendar_add">Utviklarnotis: � lage kalender involverer fleire steg: &lt;ol&gt; &lt;li&gt;Lag kalenderobjektet og endre standard rettigar dersom n�dvendig&lt;li&gt;Vel grupper og/eller brukarar som skal bruke kalenderen&lt;li&gt;Legg inn gruppe, brukarspesifikke rettar etter trong&lt;/ol&gt;</msg>
+  <msg key="Edit">Rediger</msg>
+  <msg key="edit">rediger</msg>
+  <msg key="End_Time">Sluttid</msg>
+  <msg key="Events_over_a">Innlegg over ein</msg>
+  <msg key="Friday">fredag</msg>
+  <msg key="from">fr�</msg>
+  <msg key="Grant">Gje</msg>
+  <msg key="Grant_Permissions">Gje l�yve</msg>
+  <msg key="is_recurring">Innlegg repeterer</msg>
+  <msg key="Item">Innlegg</msg>
+  <msg key="lt_Are_you_sure_you_want">Er du sikker p� at du vil slette denne kalenderen? Alle kalenderinnlegg og alle rettar som er knytte til kalenderen vil ogs� bli sletta.</msg>
+  <msg key="lt_Are_you_sure_you_want_1">Er du sikker p� at du vil slette denne aktiviteten?</msg>
+  <msg key="lt_Audiences_for_calenda">Dei som kan sj� kalendaren</msg>
+  <msg key="lt_Calendar_Administrati">Kalenderadministrasjon</msg>
+  <msg key="lt_Calendar_Administrati_1">Kalenderadministrasjon for brukar</msg>
+  <msg key="lt_Calendar_Choose_Calen">Kalender: Vel kalender</msg>
+  <msg key="lt_Calendar_detail_listi">Kalenderdetalj: skriv ut all informasjon om den individuelle kalenderen</msg>
+  <msg key="lt_Calendar_Item_Adminis">Kalenderinnleggsadministrasjon</msg>
+  <msg key="lt_Calendar_Item_Permiss">Kalenderinnleggsrettar</msg>
+  <msg key="lt_Calendars_Repeating_E">Kalender: Repeterande innlegg</msg>
+  <msg key="lt_Create_a_new_calendar">Lag ny kalender</msg>
+  <msg key="lt_delete_all_occurrence">slett alle repetisjonar</msg>
+  <msg key="lt_delete_only_this_inst">slett berre dette innlegget</msg>
+  <msg key="lt_Edit_your_Calendar_Pr">Rediger dine kalender-val</msg>
+  <msg key="lt_everyone_have_read_pe">alle har lesetilgang og kan sj� innlegga, b�de registrerte og uregistrerte brukarar.</msg>
+  <msg key="lt_Hide_Checked_Calendar">G�ym avmerkte kalendrar</msg>
+  <msg key="lt_Manage_Calendar_Audie">Organiser kven som kan sj� kalenderen</msg>
+  <msg key="lt_no_parties_exist_cont">Ingen grupper fins. kontakt systemadministrator.</msg>
+  <msg key="lt_no_privilege_exist_co">Ingen rettar fins. kontakt systemadministrator.</msg>
+  <msg key="lt_no_privilege_has_been">ingen rettar er gjevne</msg>
+  <msg key="lt_only_those_you_choose">berre dei du vel kan sj� kalenderen kan s� desse innlegga.</msg>
+  <msg key="lt_Repeat_this_event_unt">Repeter dette innlegget til:</msg>
+  <msg key="lt_The_following_is_a__l">F�lgjande liste av kalendrar er tilgjengelege for deg. Lista vil visast p� din kalender som eit val vor deg � sj� innlegg mellom desse kalendrane. Du kan velgje kva kalendrar du vil skal vere med p� denne lista.</msg>
+  <msg key="lt_There_are_no_audience">Ingen andre kan sj� denne kalendaren.</msg>
+  <msg key="lt_This_is_a_repeating_e">Dette er eit repeterande innlegg</msg>
+  <msg key="lt_You_are_choosing_to_m">Du vel � gjere dette innlegget repeterande, slik at det blir vist meir enn ein gong i kalenderen. Detaljar for innlegget er:</msg>
+  <msg key="lt_You_can_manage_the_fo">Du kan vedlikehalde f�lgjande kalendrar:</msg>
+  <msg key="lt_You_have_no_party_wid">Du har ingen kalendrar for ei heil gruppe</msg>
+  <msg key="Monday">m�ndag</msg>
+  <msg key="New_Type">Ny type:</msg>
+  <msg key="No">Nei</msg>
+  <msg key="No_Calendars">Ingen kalender</msg>
+  <msg key="No_Items">Ingen innlegg</msg>
+  <msg key="no_keep_it">nei, behald det</msg>
+  <msg key="Note">Notat</msg>
+  <msg key="of_the_month">i m�naden</msg>
+  <msg key="of_the_week">i veka</msg>
+  <msg key="Private">Privat:</msg>
+  <msg key="private">privat</msg>
+  <msg key="Public">Offentleg:</msg>
+  <msg key="public">offentleg</msg>
+  <msg key="Repeat">Repeter</msg>
+  <msg key="Repeat_1">Repeter?</msg>
+  <msg key="Repeat_every">Repeter kvar</msg>
+  <msg key="revoke">inspiser</msg>
+  <msg key="same">same</msg>
+  <msg key="Saturday">laurdag</msg>
+  <msg key="Select_Calendars">Vel kalendrar</msg>
+  <msg key="Sharing">Deling</msg>
+  <msg key="Start_Time">Starttid</msg>
+  <msg key="Submit_query">Send spurnad</msg>
+  <msg key="Sunday">sundag</msg>
+  <msg key="sync_with_Outlook">synkroniser med Outlook</msg>
+  <msg key="Thursday">torsdag</msg>
+  <msg key="Time">Tid:</msg>
+  <msg key="Title">Tittel;</msg>
+  <msg key="Title_1">Tittel</msg>
+  <msg key="to">til</msg>
+  <msg key="Tuesday">tysdag</msg>
+  <msg key="Type">Type:</msg>
+  <msg key="Type_1">Type</msg>
+  <msg key="Use_Hours_Below">Bruk timane under:</msg>
+  <msg key="Wednesday">onsdag</msg>
+  <msg key="year">�r</msg>
+  <msg key="Yes">Ja</msg>
+  <msg key="yes_delete_it">ja, slett det</msg>
+  <msg key="Yes_I_am_sure">Ja, eg er sikker</msg>
+</message_catalog>
Index: openacs-4/packages/calendar/catalog/calendar.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.no_NO.ISO-8859-1.xml,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/calendar/catalog/calendar.no_NO.ISO-8859-1.xml	10 Mar 2004 13:46:45 -0000	1.9
+++ openacs-4/packages/calendar/catalog/calendar.no_NO.ISO-8859-1.xml	6 May 2004 15:21:39 -0000	1.10
@@ -4,15 +4,16 @@
   <msg key="_You_may_choose_to">. Du kan velge �:</msg>
   <msg key="Add">Legg til</msg>
   <msg key="add">legg til</msg>
-  <msg key="Add_a_new_Audience">Legg til nye tilskuere</msg>
+  <msg key="Add_a_new_Audience">Legg til en ny gruppe personer</msg>
   <msg key="add_an_event">legg inn avtale</msg>
-  <msg key="Add_Item">Nytt innlegg</msg>
+  <msg key="Add_Item">Nyt aktivitet</msg>
   <msg key="Add_Recurrence">Legg til gjentakelse</msg>
   <msg key="All_Day_Event">Hele dagen</msg>
-  <msg key="all_events">alle innlegg</msg>
+  <msg key="all_events">alle aktivitetar</msg>
   <msg key="and_Time">og Tid</msg>
+  <msg key="Apply_to_all">Legg inn for alle aktiviteter</msg>
   <msg key="Attachments">Vedlegg</msg>
-  <msg key="Audiences_for_item">Tilskuere for innlegg</msg>
+  <msg key="Audiences_for_item">De som kan se aktiviteten</msg>
   <msg key="Calendar">Kalender</msg>
   <msg key="Calendar_Add_Item">Kalender: Nytt innlegg</msg>
   <msg key="Calendar_Edit_Item">Kalender: Rediger innlegg</msg>
@@ -29,24 +30,28 @@
   <msg key="Date">Dato:</msg>
   <msg key="Date_1">Dato</msg>
   <msg key="day">dag</msg>
+  <msg key="day_rolling_period">dager rullende periode</msg>
   <msg key="day_s">dag (er)</msg>
   <msg key="Delete">Slett</msg>
   <msg key="delete">slett</msg>
   <msg key="Description">Beskrivelse</msg>
   <msg key="Details">Detaljer:</msg>
+  <msg key="developer_note_calendar_add">Utviklernotis: � lage kalender involverer flere steg: &lt;ol&gt; &lt;li&gt;Lag kalenderobjektet og endre standard rettigheter dersom n�dvendig&lt;li&gt;Velg grupper og/eller brukere som skal bruke kalenderen&lt;li&gt;Legg inn gruppe, brukerspesifikke rettigheter etter behov&lt;/ol&gt;</msg>
   <msg key="Edit">Rediger</msg>
   <msg key="edit">rediger</msg>
   <msg key="End_Time">Sluttid</msg>
+  <msg key="Events_over_a">Innlegg over en</msg>
   <msg key="Friday">Fredag</msg>
   <msg key="from">fra</msg>
   <msg key="Grant">Gi</msg>
   <msg key="Grant_Permissions">Gi tillatelse</msg>
+  <msg key="is_recurring">Innlegg repeterer</msg>
   <msg key="Item">Innlegg</msg>
   <msg key="lt_Are_you_sure_you_want">Er du sikker p� at du vil slette denne kalenderen? Alle innleggene i kalenderen og alle tillatelsene som er knyttet til kalenderen vil bli slettet ogs�.</msg>
   <msg key="lt_Are_you_sure_you_want_1">Er du sikker p� at du vil slette dette innlegget?</msg>
   <msg key="lt_Audiences_for_calenda">Tilskuere for kalender</msg>
-  <msg key="lt_Calendar_Administrati">Kalender Administrasjon</msg>
-  <msg key="lt_Calendar_Administrati_1">kalender Administrasjon for brukere</msg>
+  <msg key="lt_Calendar_Administrati">Kalenderadministrasjon</msg>
+  <msg key="lt_Calendar_Administrati_1">Kalenderadministrasjon for brukere</msg>
   <msg key="lt_Calendar_Choose_Calen">Kalender: Velg kalender</msg>
   <msg key="lt_Calendar_detail_listi">Kalender detalj: lister all informasjon om den individuelle kalenderen</msg>
   <msg key="lt_Calendar_Item_Adminis">Kalenderinnleggsadministrasjon</msg>
@@ -74,6 +79,7 @@
   <msg key="New_Type">Ny type:</msg>
   <msg key="No">Nei</msg>
   <msg key="No_Calendars">Ingen kalendere</msg>
+  <msg key="No_Items">Ingen innlegg</msg>
   <msg key="no_keep_it">nei, behold det</msg>
   <msg key="Note">Notat</msg>
   <msg key="of_the_month">i m�neden</msg>
@@ -89,6 +95,7 @@
   <msg key="same">samme</msg>
   <msg key="Saturday">L�rdag</msg>
   <msg key="Select_Calendars">Velg kalendere</msg>
+  <msg key="Sharing">Deling</msg>
   <msg key="Start_Time">Starttid</msg>
   <msg key="Submit_query">Send foresp�rsel</msg>
   <msg key="Sunday">S�ndag</msg>
Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/calendar/tcl/calendar-procs.tcl	25 Feb 2004 13:07:07 -0000	1.24
+++ openacs-4/packages/calendar/tcl/calendar-procs.tcl	6 May 2004 15:21:40 -0000	1.25
@@ -152,7 +152,7 @@
 ad_proc -public calendar::have_private_p { 
     {-return_id 0} 
     {-calendar_id_list {}}
-    party_id 
+    {-party_id party_id }
 } {
     check to see if ther user have a private calendar
     if -return_id is 1, then proc will return the calendar_id
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/calendar/www/cal-item-new.tcl	26 Feb 2004 15:29:03 -0000	1.24
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	6 May 2004 15:21:41 -0000	1.25
@@ -154,7 +154,7 @@
     }
 } -new_request {
     # Seamlessly create a private calendar if the user doesn't have one
-    if { ![calendar::have_private_p $user_id] } {
+    if { ![calendar::have_private_p -party_id $user_id] } {
 	calendar::new -owner_id $user_id -private_p "t" -calendar_name "Personal" -package_id $package_id
     } 
     
Index: openacs-4/packages/calendar/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/index.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/calendar/www/index.tcl	25 Feb 2004 13:07:08 -0000	1.16
+++ openacs-4/packages/calendar/www/index.tcl	6 May 2004 15:21:41 -0000	1.17
@@ -12,7 +12,7 @@
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 
-if { ![calendar::have_private_p $user_id] } {
+if { ![calendar::have_private_p -party_id $user_id] } {
     calendar::new -owner_id $user_id -private_p "t" -calendar_name "Personal" -package_id $package_id
 } 
 
Index: openacs-4/packages/calendar/www/view-list-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/calendar/www/view-list-display.tcl	24 Feb 2004 16:13:45 -0000	1.22
+++ openacs-4/packages/calendar/www/view-list-display.tcl	6 May 2004 15:21:41 -0000	1.23
@@ -1,8 +1,10 @@
 if {[info exists url_stub_callback]} {
     # This parameter is only set if this file is called from .LRN.
     # This way I make sure that for the time being this adp/tcl
-    # snippet is backwards-compatible.  Will be fixed in OpenACS 5.1.
-    set portled_mode_p 1
+    # snippet is backwards-compatible.
+    set portlet_mode_p 1
+} else {
+    set portlet_mode_p 0 
 }
 
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
Index: openacs-4/packages/calendar/www/view-month-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/calendar/www/view-month-display.tcl	19 Feb 2004 17:58:37 -0000	1.16
+++ openacs-4/packages/calendar/www/view-month-display.tcl	6 May 2004 15:21:41 -0000	1.17
@@ -10,25 +10,29 @@
 if {[info exists url_stub_callback]} {
     # This parameter is only set if this file is called from .LRN.
     # This way I make sure that for the time being this adp/tcl
-    # snippet is backwards-compatible.  Will be fixed in OpenACS 5.1.
-    set portled_mode_p 1
+    # snippet is backwards-compatible.
+    set portlet_mode_p 1
 }
 
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
-    set page_num "&page_num=$page_num"
-    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>"
+    set page_num_urlvar "&page_num=$page_num"
+    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id"
     set prev_month_template "?view=month&date=\[ad_urlencode \$prev_month\]&page_num=$page_num"
-    set prev_month_template "?view=month&date=\[ad_urlencode \$next_month\]&page_num=$page_num"
+    set next_month_template "?view=month&date=\[ad_urlencode \$next_month\]&page_num=$page_num"
     set url_stub_callback "calendar_portlet_display::get_url_stub"
 } else {
     set item_template "cal-item-view?cal_item_id=\$item_id"
     set prev_month_template "view?view=month&\date=[ad_urlencode $prev_month]"
     set next_month_template "view?view=month&\date=[ad_urlencode $next_month]"
     set url_stub_callback ""
-    set page_num ""
+    set page_num_urlvar ""
     set base_url ""
 }
 
+if { ![info exists show_calendar_name_p] } {
+    set show_calendar_name_p 1
+}
+
 if {[exists_and_not_null calendar_id_list]} {
     set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] 
 } else {
@@ -157,7 +161,7 @@
 		f \
 		0 \
                 "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
-		"?view=day&date=[dt_julian_to_ansi $current_day]&page_num=${page_num}"
+		"?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar"
         } 
     }
 
@@ -197,7 +201,7 @@
 	f \
 	$time_p \
         "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
-	"?view=day&date=[dt_julian_to_ansi $current_day]&page_num=${page_num}"
+	"?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar"
 }
 
 # Add cells for remaining days inside the month
@@ -221,7 +225,7 @@
 	f \
         0 \
 	"${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
-	"?view=day&date=[dt_julian_to_ansi $current_day]&page_num=${page_num}"
+	"?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar"
 }
 
 # Add cells for remaining days outside the month
Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	19 Feb 2004 17:58:37 -0000	1.28
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	6 May 2004 15:21:41 -0000	1.29
@@ -1,14 +1,18 @@
 if {[info exists url_stub_callback]} {
     # This parameter is only set if this file is called from .LRN.
     # This way I make sure that for the time being this adp/tcl
-    # snippet is backwards-compatible.  Will be fixed in OpenACS 5.1.
-    set portled_mode_p 1
+    # snippet is backwards-compatible.
+    set portlet_mode_p 1
+} else {
+    set portlet_mode_p 0 
 }
 
+set current_date $date
+
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
-    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>"
+    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id"
     set url_stub_callback "calendar_portlet_display::get_url_stub"
-    set hour_template "calendar/cal-item-new?date=$current_date&start_time=\$localized_day_current_hour"
+    set hour_template "calendar/cal-item-new?date=foofoo$current_date&start_time=\$day_current_hour"
 } else {
     set item_template "cal-item-view?cal_item_id=\$item_id"
     set url_stub_callback ""
@@ -33,7 +37,6 @@
     set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] 
 }
 
-set current_date $date
 if {[empty_string_p $date]} {
     # Default to todays date in the users (the connection) timezone
     set server_now_time [dt_systime]
@@ -106,22 +109,18 @@
     set ansi_start_date [lc_time_system_to_conn $ansi_start_date]
     set ansi_end_date [lc_time_system_to_conn $ansi_end_date]
 
-    set start_hour [lc_time_fmt $ansi_start_date "%H"]
-    set end_hour [lc_time_fmt $ansi_end_date "%H"]
     set start_time [lc_time_fmt $ansi_start_date "%X"]
     set end_time [lc_time_fmt $ansi_end_date "%X"]
 
-    if {![regexp {([1-9][0-9]*)} $start_hour match start_hour_no]} {
-        set start_hour_no 0
+    if {($start_hour == $end_hour) || ($end_minutes > 0)} {
+        incr end_hour
     }
-    if {![regexp {([1-9][0-9]*)} $end_hour match end_hour_no]} {
-        set end_hour_no 0
-    }
 
     for { set item_current_hour $start_hour } { $item_current_hour < $end_hour } { incr item_current_hour } {
         set item_current_hour [expr [string trimleft $item_current_hour 0]+0]
 
-        if { $start_hour_no == $item_current_hour } {
+        if { $start_hour == $item_current_hour } {
+
             lappend day_items_per_hour \
                 [list $item_current_hour $name $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time]
         } else {
@@ -147,11 +146,10 @@
     set item_start_hour [expr [string trimleft [lindex $this_item 5] 0]+0]
     set item_end_hour [expr [string trimleft [lindex $this_item 6] 0]+0]
     set rowspan [expr $item_end_hour - $item_start_hour]
-
     if {$item_start_hour > $day_current_hour && \
-            $item_start_hour >= $start_display_hour && \
-            $item_end_hour <= $end_display_hour} {
+            $item_start_hour >= $start_display_hour} {
         # need to add dummy entries to show all hours
+
         for {  } { $day_current_hour < $item_start_hour } { incr day_current_hour } {
 	    set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X"]
             multirow append items \
@@ -207,7 +205,7 @@
 
 if {$day_current_hour < $end_display_hour } {
     # need to add dummy entries to show all hours
-    for {  } { $day_current_hour <= $end_display_hour } { incr day_current_hour } {
+    for {  } { $day_current_hour < $end_display_hour } { incr day_current_hour } {
 	set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X" [ad_conn locale]]
         multirow append items \
             "" \
@@ -225,7 +223,11 @@
 
 db_1row dbqd.calendar.www.views.select_day_info {}
 
-set previous_week_url "view?view=day&date=[ns_urlencode $yesterday]"
-set next_week_url "view?view=day&date=[ns_urlencode $tomorrow]"
-
+if {$portlet_mode_p} {
+    set previous_week_url "?page_num=$page_num&date=[ns_urlencode $yesterday]"
+    set next_week_url "?page_num=$page_num&&date=[ns_urlencode $tomorrow]"
+} else {
+    set previous_week_url "view?view=day&date=[ns_urlencode $yesterday]"
+    set next_week_url "view?view=day&date=[ns_urlencode $tomorrow]"
+}
 set dates [lc_time_fmt $date "%q"]
Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/calendar/www/view-week-display.tcl	19 Feb 2004 17:58:37 -0000	1.15
+++ openacs-4/packages/calendar/www/view-week-display.tcl	6 May 2004 15:21:41 -0000	1.16
@@ -1,23 +1,29 @@
 if {[info exists url_stub_callback]} {
     # This parameter is only set if this file is called from .LRN.
     # This way I make sure that for the time being this adp/tcl
-    # snippet is backwards-compatible.  Will be fixed in OpenACS 5.1.
-    set portled_mode_p 1
+    # snippet is backwards-compatible.
+    set portlet_mode_p 1
+} else {
+    set portlet_mode_p 0 
 }
 
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
-    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>"
+    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id"
     set url_stub_callback "calendar_portlet_display::get_url_stub"
     set page_num_formvar [export_form_vars page_num]
-    set page_num "&page_num=$page_num"
+    set page_num_urlvar "&page_num=$page_num"
 } else {
     set item_template "cal-item-view?cal_item_id=\$item_id"
     set url_stub_callback ""
     set page_num_formvar ""
-    set page_num ""
+    set page_num_urlvar ""
     set base_url ""
 }
 
+if { ![info exists show_calendar_name_p] } {
+    set show_calendar_name_p 1
+}
+
 if {[exists_and_not_null calendar_id_list]} {
     set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] 
 } else {
@@ -100,7 +106,7 @@
             "" \
             "" \
             "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" \
-            "?view=day&date=$ansi_this_date&page_num=${page_num}"
+            "?view=day&date=$ansi_this_date&page_num_urlvar"
     }
 
     set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]]
@@ -131,7 +137,7 @@
         $start_time \
         $end_time \
         $no_time_p \
-        "?view=day&date=$ansi_start_date&page_num=${page_num}" \
+        "?view=day&date=$ansi_start_date&page_num_urlvar" \
         "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" 
     set current_weekday $day_of_week
 }
@@ -152,11 +158,16 @@
             "" \
             "" \
             "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" \
-            "?view=day&date=$ansi_this_date&page_num=${page_num}" 
+            "?view=day&date=$ansi_this_date&page_num_urlvar" 
     }
 }
 
 # Navigation Bar
 set dates "[lc_time_fmt $first_weekday_date "%q"] - [lc_time_fmt $last_weekday_date "%q"]"
-set previous_week_url "view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]"
-set next_week_url "view?view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]"
+if {$portlet_mode_p} {
+    set previous_week_url "?$page_num_urlvar&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]"
+    set next_week_url "?$page_num_urlvar&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]"
+} else {
+    set previous_week_url "view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]"
+    set next_week_url "?view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]"
+}
Index: openacs-4/packages/calendar/www/views-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-oracle.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar/www/views-oracle.xql	19 Feb 2004 17:58:37 -0000	1.4
+++ openacs-4/packages/calendar/www/views-oracle.xql	6 May 2004 15:21:41 -0000	1.5
@@ -7,6 +7,9 @@
   <querytext>
     select to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date,
          to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date,
+         to_number(to_char(start_date,'HH24'),'90') as start_hour,
+         to_number(to_char(end_date,'HH24'),'90') as end_hour,
+         to_number(to_char(end_date,'MI'),'90') as end_minutes,
          nvl(e.name, a.name) as name,
          nvl(e.status_summary, a.status_summary) as status_summary,
          e.event_id as item_id,
Index: openacs-4/packages/calendar/www/views-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-postgresql.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar/www/views-postgresql.xql	27 Feb 2004 21:29:59 -0000	1.4
+++ openacs-4/packages/calendar/www/views-postgresql.xql	6 May 2004 15:21:41 -0000	1.5
@@ -7,6 +7,9 @@
   <querytext>
     select   to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date,
              to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date,
+             to_number(to_char(start_date,'HH24'),'90') as start_hour,
+             to_number(to_char(end_date,'HH24'),'90') as end_hour,
+             to_number(to_char(end_date,'MI'),'90') as end_minutes,
              coalesce(e.name, a.name) as name,
              coalesce(e.status_summary, a.status_summary) as status_summary,
              e.event_id as item_id,