Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v
diff -u -r1.30.2.3 -r1.30.2.4
--- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	10 Oct 2008 13:08:00 -0000	1.30.2.3
+++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	17 Oct 2008 12:37:33 -0000	1.30.2.4
@@ -36,6 +36,7 @@
   <msg key="Current_Permissions">Current Permissions</msg>
   <msg key="Date">Date:</msg>
   <msg key="Date_1">Date</msg>
+  <msg key="Day">Day</msg>
   <msg key="day">day</msg>
   <msg key="day_rolling_period">day rolling period</msg>
   <description key="day_rolling_period">Please, could you give more info of the context for this, thanks</description>
@@ -87,6 +88,7 @@
   <msg key="is_recurring">Item is recurring.</msg>
   <msg key="Item">Item</msg>
   <msg key="last_week">last week</msg>
+  <msg key="List">List</msg>
   <msg key="lt_Are_you_sure_you_want">Are you sure you want to delete this calendar. All the calendar items
       and all the permission that's associated with this calendar will be 
       deleted as well.</msg>
@@ -148,6 +150,7 @@
   <msg key="lt_You_have_no_party_wid">You have no party wide calendars</msg>
   <msg key="Manage_Item_Types">Manage Item Types</msg>
   <msg key="Monday">Monday</msg>
+  <msg key="Month">Month</msg>
   <msg key="New_Type">New Type:</msg>
   <msg key="next_day">Next day</msg>
   <msg key="next_month">Next Month</msg>
@@ -202,6 +205,7 @@
   <msg key="Use_Hours_Below">Use Hours Below:</msg>
   <msg key="view">View</msg>
   <msg key="Wednesday">Wednesday</msg>
+  <msg key="Week">Week</msg>
   <msg key="Week_of">Week of</msg>
   <msg key="y-m-d">y-m-d</msg>
   <msg key="year">year</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 -r1.17.2.3 -r1.17.2.4
--- openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml	14 Oct 2008 11:59:15 -0000	1.17.2.3
+++ openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml	17 Oct 2008 12:37:33 -0000	1.17.2.4
@@ -34,6 +34,7 @@
   <msg key="Current_Permissions">Permisos actuales</msg>
   <msg key="Date">Fecha:</msg>
   <msg key="Date_1">Fecha</msg>
+  <msg key="Day">D�a</msg>
   <msg key="day">d�a</msg>
   <msg key="day_rolling_period">d�as</msg>
   <msg key="day_s">d�a(s)</msg>
@@ -77,6 +78,7 @@
   <msg key="is_recurring">El evento se repite</msg>
   <msg key="Item">Evento</msg>
   <msg key="last_week">semana anterior</msg>
+  <msg key="List">Lista</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>
   <msg key="lt_Audiences_for_calenda">Audiencias del calendario</msg>
@@ -130,6 +132,7 @@
   <msg key="lt_You_have_no_party_wid">No tiene acceso a calendarios algunos</msg>
   <msg key="Manage_Item_Types">Administrar los tipos de eventos</msg>
   <msg key="Monday">Lunes</msg>
+  <msg key="Month">Mes</msg>
   <msg key="New_Type">Categor�a nueva:</msg>
   <msg key="next_day">D�a siguiente</msg>
   <msg key="next_month">Mes siguiente</msg>
@@ -182,6 +185,7 @@
   <msg key="Use_Hours_Below">Horario:</msg>
   <msg key="view">Vista</msg>
   <msg key="Wednesday">Mi�rcoles</msg>
+  <msg key="Week">Semana</msg>
   <msg key="Week_of">Semana</msg>
   <msg key="y-m-d">aaaa-mm-dd</msg>
   <msg key="year">a�o</msg>
Index: openacs-4/packages/calendar/www/navbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/calendar/www/navbar.tcl	23 May 2008 09:24:29 -0000	1.2.2.1
+++ openacs-4/packages/calendar/www/navbar.tcl	17 Oct 2008 12:37:33 -0000	1.2.2.2
@@ -37,49 +37,49 @@
 multirow create views name text url spacer selected_p onclick
 
 multirow append views \
-    "Day" \
+    [_ calendar.Day] \
     "day" \
     "[export_vars -base $base_url {date {view day}}]${page_num}\#calendar" \
     "&nbsp;&nbsp; | &nbsp;&nbsp;" \
     $day_selected_p \
     ""
 
 multirow append views \
-    "Week" \
+    [_ calendar.Week] \
     "week" \
     "[export_vars -base $base_url {date {view week}}]${page_num}\#calendar" \
     "&nbsp;&nbsp; | &nbsp;&nbsp;" \
     $week_selected_p \
     ""
 
 multirow append views \
-    "Month" \
+    [_ calendar.Month] \
     "month" \
     "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \
     "&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" \
     $month_selected_p \
     ""
 
-multirow append views \
-    " Calendar" \
-    "calendar" \
-    "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \
-    "&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;" \
-    $calendar_selected_p \
-    ""
+# multirow append views \
+#     " Calendar" \
+#     "calendar" \
+#     "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \
+#     "&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;" \
+#     $calendar_selected_p \
+#     ""
 
 multirow append views \
-    " List" \
+    [_ calendar.List] \
     "list" \
     "[export_vars -base $base_url {date {view list}}]${page_num}${url_stub_period_days}\#calendar" \
-    "&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;" \
+    "" \
     $list_selected_p \
     ""
 
-multirow append views \
-    " Print" \
-    "print" \
-    "[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print" \
-    "" \
-    f \
-    "return calOpenPrintView('[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print');"
+# multirow append views \
+#     " Print" \
+#     "print" \
+#     "[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print" \
+#     "" \
+#     f \
+#     "return calOpenPrintView('[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print');"