Updated for the upcoming release. Same here.

2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>

	* POTFILES.in: Updated for the upcoming release.
	* no.po: Same here.

svn path=/trunk/; revision=5930

3 files changed, 289 insertions, 71 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7fdf2b3a05..b497465aca 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* POTFILES.in: Updated for the upcoming release.
+	* no.po: Same here.
+	
 2000-10-14  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nn.po: Added Norwegian (nynorsk) translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d29233f61d..b11732b9d0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,12 +33,15 @@ calendar/gui/calendar-model.c
 calendar/gui/control-factory.c
 calendar/gui/dialogs/alarm-notify-dialog.c
 calendar/gui/dialogs/alarm-notify.glade.h
+calendar/gui/dialogs/cal-prefs-dialog.glade.h
 calendar/gui/dialogs/task-editor.c
 calendar/gui/dialogs/task-editor-dialog.glade.h
 calendar/gui/e-calendar-table.c
 calendar/gui/e-day-view-time-item.c
+calendar/gui/e-day-view-top-item.c
 calendar/gui/e-day-view.c
 calendar/gui/e-week-view.c
+calendar/gui/e-week-view-main-item.c
 calendar/gui/event-editor.c
 calendar/gui/event-editor-dialog.glade.h
 calendar/gui/getdate.y
@@ -88,6 +91,7 @@ mail/mail-vfolder.c
 mail/mail-view.c
 #mail/main.c
 mail/message-list.c
+mail/subscribe-dialog.c
 #notes/component-factory.c	: not in Makefile.am
 #notes/main.c			: not in Makefile.am
 shell/e-setup.c
@@ -111,6 +115,7 @@ ui/evolution-mail.h
 ui/evolution-subscribe.h
 ui/evolution.h
 widgets/meeting-time-sel/e-meeting-time-sel.c
+widgets/meeting-time-sel/e-meeting-time-sel-item.c
 widgets/misc/e-calendar.c
 widgets/misc/e-calendar-item.c
 widgets/misc/e-clipped-label.c
diff --git a/po/no.po b/po/no.po
index 5b4b857812..db50789de5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-10-14 22:22+0200\n"
-"PO-Revision-Date: 2000-10-15 00:11+02:00\n"
+"POT-Creation-Date: 2000-10-16 00:07+0200\n"
+"PO-Revision-Date: 2000-10-16 00:13+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1068,6 +1068,7 @@ msgstr "Lagre kalender"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
@@ -1140,6 +1141,7 @@ msgstr ""
 
 #. strptime format for a date.
 #: calendar/gui/calendar-model.c:849 calendar/gui/calendar-model.c:897
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
 #: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
 msgid "%m/%d/%Y"
@@ -1224,6 +1226,262 @@ msgstr "Rediger avtale:"
 msgid "Snooze time (minutes)"
 msgstr "Utsett-tid (minutter)"
 
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Calendar Preferences"
+msgstr "Brukervalg for kalender"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Work week"
+msgstr "Arbeidsuke"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:53
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Man"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:54
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Tir"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Ons"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Tor"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fre"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Lør"
+
+#. Initialize by default to three-letter day names
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Søn"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "First day of week:"
+msgstr "Første dag i uken:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:354
+msgid "Monday"
+msgstr "Mandag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Tuesday"
+msgstr "Tirsdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "Friday"
+msgstr "Fredag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Saturday"
+msgstr "Lørdag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 calendar/gui/prop.c:353
+msgid "Sunday"
+msgstr "Søndag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Start of day:"
+msgstr "Dagen starter:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Dagen slutter:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Display options"
+msgstr "Vis alternativer"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Time divisions:"
+msgstr "Oppdeling av tid:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Time format:"
+msgstr "Tidformat:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Show appointment end times"
+msgstr "Vis tid for avtalers slutt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+msgid "Compress weekends"
+msgstr "Komprimér helger"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "12 hour (am/pm)"
+msgstr "12 timer (am/pm)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "24 hour"
+msgstr "24 timer"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "60 minutes"
+msgstr "60 minutter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "30 minutes"
+msgstr "30 minutter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "15 minutes"
+msgstr "15 minutter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "10 minutes"
+msgstr "10 minutter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "05 minutes"
+msgstr "5 minutter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Date navigator options"
+msgstr "Alternativer for datonavigator"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Show week numbers"
+msgstr "Vis ukenummer"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show"
+msgstr "Vis"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
+msgid "Due Date"
+msgstr "Ferdig-dato"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
+msgid "Time Until Due"
+msgstr "Tid før den går ut"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "Highlight"
+msgstr "Markér"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Overdue Items"
+msgstr "Utgåtte oppføringer"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Items Due Today"
+msgstr "Oppføringer som går ut idag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Items Not Yet Due"
+msgstr "Oppføringer som ikke har gått ut"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
+msgid "Colors"
+msgstr "Farger"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+msgid "Pick a color"
+msgstr "Velg en farge"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Items Not Yet Due:"
+msgstr "Oppføringer som ikke har gått ut:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Items Due Today:"
+msgstr "Oppføringer som går ut i dag:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "Overdue Items:"
+msgstr "Utgåtte oppføringer:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "TaskPad"
+msgstr "Oppgaveblokk"
+
+#. populate default frame/box
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
+msgid "Defaults"
+msgstr "Forvalg"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Remind me of all appointments"
+msgstr "Påminnelse om alle avtaler"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+msgid "minutes before they occur."
+msgstr "minutter i forveien."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "Visual Alarms"
+msgstr "Visuelle alarmer"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "Beep when alarm windows appear."
+msgstr "Pip når alarmvinduet kommer til syne."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+msgid "Audio Alarms"
+msgstr "Lyd-alarmer"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+msgid "Alarms timeout after"
+msgstr "Tidsavbrudd for alarm etter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+msgid "seconds."
+msgstr "sekunder"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+msgid "Enable snoozing for"
+msgstr "Slå på utsetting for "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+msgid "Reminders"
+msgstr "Påminnelser"
+
 #: calendar/gui/dialogs/task-editor.c:427
 #: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1178
 msgid "FIXME: _Task"
@@ -1677,19 +1935,22 @@ msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1186
+#: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -1721,6 +1982,13 @@ msgstr "Slett denne oppføringen"
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr "%d %B"
+
 #: calendar/gui/event-editor.c:279
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
@@ -1909,42 +2177,6 @@ msgstr "etikett24"
 msgid "week(s)"
 msgstr "uke(r)"
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Man"
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tir"
-
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tor"
-
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Lør"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Søn"
-
 #: calendar/gui/event-editor-dialog.glade.h:60
 msgid "label25"
 msgstr "etikett25"
@@ -2538,14 +2770,6 @@ msgstr "24 timer"
 msgid "Weeks start on"
 msgstr "Uken starter på"
 
-#: calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Søndag"
-
-#: calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Mandag"
-
 #. Day range
 #: calendar/gui/prop.c:364
 msgid "Day range"
@@ -2575,26 +2799,10 @@ msgstr "Dagens slutt:"
 msgid "Colors for display"
 msgstr "Farger i visning"
 
-#: calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Farger"
-
 #: calendar/gui/prop.c:605
 msgid "Show on TODO List:"
 msgstr "Vis på oppgavelisten:"
 
-#: calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Ferdig-dato"
-
-#: calendar/gui/prop.c:611
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "Tid før den går ut"
-
 #: calendar/gui/prop.c:643
 msgid "To Do List style options:"
 msgstr "Alternativer for stil for oppgaveliste:"
@@ -2648,11 +2856,6 @@ msgstr " sekunder"
 msgid "Enable snoozing for "
 msgstr "Slå på utsetting for "
 
-#. populate default frame/box
-#: calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Forvalg"
-
 #: composer/e-msg-composer-address-dialog.c:186
 msgid "Cut"
 msgstr "Klipp ut"
@@ -3732,7 +3935,7 @@ msgstr "Skanner mapper i \"%s\""
 msgid "Scan folders in \"%s\""
 msgstr "Skann foldere i \"%s\""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1441 mail/subscribe-dialog.c:163
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
@@ -4054,6 +4257,10 @@ msgstr "Filtrér etter e-postliste"
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrér etter e-postliste (%s)"
 
+#: mail/subscribe-dialog.c:118
+msgid "Display folders containing:"
+msgstr "Vis mapper som inneholder:"
+
 #: shell/e-setup.c:47
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
@@ -4995,6 +5202,7 @@ msgstr "Alle deltakere"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"