From: Matt <matt@uncensored.citadel.org>
Date: Sat, 31 Jan 2009 09:45:18 +0000 (+0000)
Subject: * fix preview_pane scroll memory bug
X-Git-Tag: v7.86~1523
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1180230743bb2d205a87866849723c91a9ac0b4d

* fix preview_pane scroll memory bug
* fix openid login page, but haven't been able to test
* ran create-pot.sh, as I split up openid login bullets as well
* update nl.po and fr.po with the two new lines
---

diff --git a/webcit/auth.c b/webcit/auth.c
index 80543450f..4448d48df 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -51,43 +51,10 @@ void display_login(void)
  */
 void display_openid_login(char *mesg)
 {
-	char buf[SIZ];
-
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"login_screen\">\n");
-
-	if ((mesg != NULL) && (!IsEmptyStr(mesg))) {
-		stresc(buf, SIZ,  mesg, 0, 0);
-		svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
-	}
-
-	svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
-		_("<ul>"
-		"<li>Enter your OpenID URL and click &quot;Login&quot;."
-		"<li><a href=\"http://www.citadel.org/doku.php/documentation:openid\">"
-		"Click here to learn what OpenID is and how Citadel is using it.</a>"
-		"<li>Please log off properly when finished. "
-		"<li>You must use a browser that supports <i>frames</i> and "
-		"<i>cookies</i>. "
-		"<li>Also keep in mind that if your browser is "
-		"configured to block pop-up windows, you will not be able "
-		"to receive any instant messages.<br>"
-		"</ul>")
-	);
-
-	svput("HELLO", WCS_SERVCMD, "MESG hello");
-	
-	svprintf(HKEY("OFFER_CONVENTIONAL_LOGIN"), WCS_STRING,
-		"<div id=\"convlogin\">"
-		"<a href=\"display_login\">"
-		"%s</a>"
-		"</div>"
-		,
-		"Log in using a user name and password"
-	);
-
-	do_template("openid_login", NULL);
-	wDumpContent(2);
+  begin_burst();
+  output_headers(1, 0, 0, 0, 1, 0);
+  do_template("openid_login", NULL);
+  end_burst();
 }
 
 
diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index ab1be43c7..68655ad53 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -414,6 +414,7 @@ int Conditional_ROOM_DISPLAY_MSG(StrBuf *Target, WCTemplputParams *TP) {
 	IterateStruct *ITC = CCTX;
 	int num_inset = ITC->n;
 	if ((num_inset >= WC->startmsg) && (WCC->num_displayed <= WCC->maxmsgs)) {
+
 	WCC->num_displayed = WCC->num_displayed+1;
 	return 1; /* Pass GO, collect $200 */
 	} 
diff --git a/webcit/po/da.po b/webcit/po/da.po
index 3f4887b1c..18cfbe79b 100644
--- a/webcit/po/da.po
+++ b/webcit/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WebCit 6.82\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Flemming Veggerby <fveggerby@dbmail.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -26,7 +26,7 @@ msgstr "Tilføj"
 msgid "Deleted"
 msgstr "Slettet"
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -62,67 +62,48 @@ msgstr "Foretrukken Bruger"
 msgid "Aide"
 msgstr "Systemansvarlig"
 
-#: ../auth.c:65
-#, fuzzy
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-"<ul><li><b>Hvis du allerede har en konto på %s</b>, skriv dit brugernavn og "
-"adgangskode og klik &quot;Log på.&quot; <li><b>Hvis du er ny bruger</b>, "
-"skriv det brugernavn og adgangskode du ønsker at bruge, og klik &quot;Ny "
-"Bruger.&quot; <li>Log venligst af, når du er færdig. <li>Du skal bruge en "
-"browser der supporterer <i>frames</i> og <i>cookies</i>. <li>Hvis din "
-"browser er konfigureret til at blokere pop-up vinduer, vil du ikke være i "
-"stand til at modtage online meddelelser.<br /></ul>"
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr ""
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr ""
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr ""
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr "Brugernavn"
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr "Afslut"
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr ""
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr "Blanke adgangskoder er ikke tilladt."
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr "Din adgangskode blev ikke accepteret."
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr "Log af"
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
@@ -130,68 +111,68 @@ msgstr ""
 "Dette program kunne ikke tilslutte eller forblive tilsluttet til Citadel "
 "serveren.  KOntakt din Systemadministrator."
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr ""
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr "Log på igen"
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr "Luk vinduet"
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr "Validér nye brugere"
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr "Ingen brugere kræver validering på dette tidspunkt."
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr ""
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr ""
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr ""
 
-#: ../auth.c:711
+#: ../auth.c:678
 msgid "strong"
 msgstr ""
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Aktuelt brugerniveau: %d (%s)\n"
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr "Vælg brugerniveau for denne bruger:"
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr "Skift din adgangskode"
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr "Skriv ny adgangskode:"
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr "Skriv adgangskode igen:"
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr "Skift adgangskode"
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -199,11 +180,11 @@ msgstr "Skift adgangskode"
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr "Afbrudt.  Adgangskode blev ikke ændret."
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr "Adgangskoder matcher ikke.  Adgangskode blev ikke ændret."
 
@@ -402,7 +383,7 @@ msgstr "Gem"
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr "Slet"
 
@@ -1111,7 +1092,7 @@ msgid "Move this message to:"
 msgstr "Flyt denne meddelelse til:"
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr "Flyt"
 
@@ -1155,11 +1136,11 @@ msgstr ""
 msgid "Mailbox view mode"
 msgstr ""
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr "editér"
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 #, fuzzy
 msgid "I don't know how to display "
 msgstr "Jeg kan ikke vise %s"
@@ -1884,7 +1865,7 @@ msgstr "Rum liste visning"
 msgid "Show empty floors"
 msgstr ""
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr "Svar"
 
@@ -2193,7 +2174,7 @@ msgstr ""
 msgid "Add rule"
 msgstr "Tilføj brugere"
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr "Din system konfiguration er blevet opdateret"
 
@@ -2888,6 +2869,7 @@ msgid "To:"
 msgstr "Til:"
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr "CC:"
 
@@ -2895,7 +2877,9 @@ msgstr "CC:"
 msgid "BCC:"
 msgstr "BCC:"
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr "Emne:"
 
@@ -3007,7 +2991,7 @@ msgstr "skift til menu"
 msgid "My folders"
 msgstr "Post Mappe"
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 msgid "powered by"
 msgstr ""
 
@@ -3015,48 +2999,48 @@ msgstr ""
 msgid "Password:"
 msgstr "Adgangskode"
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr "Sprog"
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr ""
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr ""
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
 msgstr ""
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
 msgstr ""
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 #, fuzzy
 msgid "See the"
 msgstr "Slet"
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
@@ -3202,10 +3186,25 @@ msgid "Copy"
 msgstr ""
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr "Udskriv"
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr ""
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr "Præferencer og indstillinger"
@@ -3215,6 +3214,18 @@ msgstr "Præferencer og indstillinger"
 msgid "Select"
 msgstr "Slet"
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr ""
@@ -3603,21 +3614,26 @@ msgstr "Dato og tid for sidste login"
 msgid "Auto-purge after this many days"
 msgstr "Auto-slet efter så mange dage"
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr "fra"
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+#, fuzzy
+msgid "to"
+msgstr "til"
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr "SvarCitér"
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr "Headers"
 
@@ -3664,6 +3680,24 @@ msgstr "Brugere i øjeblikket på %s"
 msgid "(kill)"
 msgstr "(dræb)"
 
+#, fuzzy
+#~ msgid ""
+#~ "<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
+#~ "\"http://www.citadel.org/doku.php/documentation:openid\">Click here to "
+#~ "learn what OpenID is and how Citadel is using it.</a><li>Please log off "
+#~ "properly when finished. <li>You must use a browser that supports "
+#~ "<i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your "
+#~ "browser is configured to block pop-up windows, you will not be able to "
+#~ "receive any instant messages.<br></ul>"
+#~ msgstr ""
+#~ "<ul><li><b>Hvis du allerede har en konto på %s</b>, skriv dit brugernavn "
+#~ "og adgangskode og klik &quot;Log på.&quot; <li><b>Hvis du er ny bruger</"
+#~ "b>, skriv det brugernavn og adgangskode du ønsker at bruge, og klik &quot;"
+#~ "Ny Bruger.&quot; <li>Log venligst af, når du er færdig. <li>Du skal bruge "
+#~ "en browser der supporterer <i>frames</i> og <i>cookies</i>. <li>Hvis din "
+#~ "browser er konfigureret til at blokere pop-up vinduer, vil du ikke være i "
+#~ "stand til at modtage online meddelelser.<br /></ul>"
+
 #, fuzzy
 #~ msgid ""
 #~ "enter your user name and password and click &quot;Login.&quot;<li><b>If "
@@ -3732,9 +3766,6 @@ msgstr "(dræb)"
 #~ msgid "Internet configuration"
 #~ msgstr "Internet konfiguration"
 
-#~ msgid "to "
-#~ msgstr "til"
-
 #~ msgid "ReplyAll"
 #~ msgstr "SvarAlle"
 
diff --git a/webcit/po/de.po b/webcit/po/de.po
index 6ea0d04cb..6e3279d48 100644
--- a/webcit/po/de.po
+++ b/webcit/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: 2007-03-14 23:18+0100\n"
 "Last-Translator: Wilfried Goesgens <dothebart@uncensored.citadel.org>\n"
 "Language-Team:  <en@li.org>\n"
@@ -30,7 +30,7 @@ msgstr "Hinzufügen"
 msgid "Deleted"
 msgstr "gelöscht"
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -66,71 +66,49 @@ msgstr "nur Privilegierte Benutzer"
 msgid "Aide"
 msgstr "Verantwortlicher"
 
-#: ../auth.c:65
-#, fuzzy
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-"<ul>\n"
-"<li><b>Wenn Sie schon einen Benutzer bei %s</b> haben, Benutzername und "
-"Passwort eingeben und 'Anmelden' drücken. </li>\n"
-"<li><b>Wenn Sie einen neuen Benutzer anlegen wollen, Benutzername und "
-"Passwort eingeben und 'Neuer Benutzer' drücken.</li>\n"
-"<li>Bitte melden Sie sich ordentlich ab, wenn Sie fertig sind.</li>\n"
-"<li>Ihr Browser muss <i>Frames</i> und <i>Cookies</i> unterstützen</li>\n"
-"<li>Kurznachrichten könnten dem Popup-Blocker Ihres Browsers zum Opfer "
-"fallen</li>\n"
-"<br /></ul>"
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr ""
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr ""
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr ""
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr "Benutzername:"
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr "Ende"
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr ""
 "\"%s - mit <a href=\\\"http://www.citadel.org\\\">Citadel</a> Technologie"
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr "Leere Passwörter sind nicht zulässig."
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr "Ihr Passwort wurde nicht akzeptiert"
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr "Abmelden"
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
@@ -138,69 +116,69 @@ msgstr ""
 "Dieses Programm konnte keine Verbindung zum Citadel-Server herstellen oder "
 "aufrechterhalten.Bitte wenden Sie sich an Ihren Administrator."
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr "Weiter lesen..."
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr "Erneut anmelden"
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr "Fenster schließen"
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr "Neue Benutzer überprüfen"
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr "Zur Zeit müssen keine Benutzer validiert werden."
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr ""
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr ""
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr ""
 
-#: ../auth.c:711
+#: ../auth.c:678
 #, fuzzy
 msgid "strong"
 msgstr "stop"
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Aktuelle Berechtigungen: %d (%s)\n"
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr "Berechtigungen dieses Benutzers"
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr "Ändern Sie Ihr Passwort"
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr "Bitte geben Sie ein neues Passwort ein"
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr "Noch einmal zur Verifizierung:"
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -208,11 +186,11 @@ msgstr "Passwort ändern"
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr "Abgebrochen. Passwort wurde nicht gesetzt."
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr "Die Passwörter stimmen nicht überein. Passwort nicht geändert"
 
@@ -411,7 +389,7 @@ msgstr "Speichern"
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1110,7 +1088,7 @@ msgid "Move this message to:"
 msgstr "Meldung verschieben nach:"
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr "Verschieben"
 
@@ -1154,11 +1132,11 @@ msgstr ""
 msgid "Mailbox view mode"
 msgstr ""
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr "bearbeiten"
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 #, fuzzy
 msgid "I don't know how to display "
 msgstr "Kann %s nicht darstellen"
@@ -1877,7 +1855,7 @@ msgstr "Raumlisten Anzeige"
 msgid "Show empty floors"
 msgstr "Leere Verzeichnisse Anzeigen"
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr "Antworten"
 
@@ -2164,7 +2142,7 @@ msgstr "und dann"
 msgid "Add rule"
 msgstr "Neue Regel"
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr "Ihre Systemkonfiguration wurde übernommen"
 
@@ -2853,6 +2831,7 @@ msgid "To:"
 msgstr "An:"
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr "CC:"
 
@@ -2860,7 +2839,9 @@ msgstr "CC:"
 msgid "BCC:"
 msgstr "BCC:"
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr "Betreff:"
 
@@ -2969,7 +2950,7 @@ msgstr "Zurück zum Menü"
 msgid "My folders"
 msgstr "Mail-Ordner"
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 #, fuzzy
 msgid "powered by"
 msgstr "%s - mit Citadel-Technologie"
@@ -2978,48 +2959,48 @@ msgstr "%s - mit Citadel-Technologie"
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr "Sprache:"
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr ""
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr ""
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
 msgstr ""
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
 msgstr ""
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 #, fuzzy
 msgid "See the"
 msgstr "Löschen"
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
@@ -3164,10 +3145,25 @@ msgid "Copy"
 msgstr ""
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr "Drucken"
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr ""
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr "Einstellungen"
@@ -3177,6 +3173,18 @@ msgstr "Einstellungen"
 msgid "Select"
 msgstr "Löschen"
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr "Diashow"
@@ -3566,21 +3574,26 @@ msgstr "Datum der letzten Anmeldung"
 msgid "Auto-purge after this many days"
 msgstr "Automatisch löschen nach n Tagen"
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr "von "
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+#, fuzzy
+msgid "to"
+msgstr "an "
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr "Antworten&amp;Zitieren"
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr "Kopfzeilen"
 
@@ -3627,6 +3640,27 @@ msgstr "Angemeldete Benutzer auf %s"
 msgid "(kill)"
 msgstr "(beenden)"
 
+#, fuzzy
+#~ msgid ""
+#~ "<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
+#~ "\"http://www.citadel.org/doku.php/documentation:openid\">Click here to "
+#~ "learn what OpenID is and how Citadel is using it.</a><li>Please log off "
+#~ "properly when finished. <li>You must use a browser that supports "
+#~ "<i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your "
+#~ "browser is configured to block pop-up windows, you will not be able to "
+#~ "receive any instant messages.<br></ul>"
+#~ msgstr ""
+#~ "<ul>\n"
+#~ "<li><b>Wenn Sie schon einen Benutzer bei %s</b> haben, Benutzername und "
+#~ "Passwort eingeben und 'Anmelden' drücken. </li>\n"
+#~ "<li><b>Wenn Sie einen neuen Benutzer anlegen wollen, Benutzername und "
+#~ "Passwort eingeben und 'Neuer Benutzer' drücken.</li>\n"
+#~ "<li>Bitte melden Sie sich ordentlich ab, wenn Sie fertig sind.</li>\n"
+#~ "<li>Ihr Browser muss <i>Frames</i> und <i>Cookies</i> unterstützen</li>\n"
+#~ "<li>Kurznachrichten könnten dem Popup-Blocker Ihres Browsers zum Opfer "
+#~ "fallen</li>\n"
+#~ "<br /></ul>"
+
 #, fuzzy
 #~ msgid ""
 #~ "enter your user name and password and click &quot;Login.&quot;<li><b>If "
@@ -3703,9 +3737,6 @@ msgstr "(beenden)"
 #~ "Der Citadel-Server wurde neu gestartet. Er wird in kürze wieder "
 #~ "verfuegbar sein."
 
-#~ msgid "to "
-#~ msgstr "an "
-
 #~ msgid "ReplyAll"
 #~ msgstr "AntwortenAnAlle"
 
diff --git a/webcit/po/en_GB.po b/webcit/po/en_GB.po
index 415aeae24..f26308c2b 100644
--- a/webcit/po/en_GB.po
+++ b/webcit/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WebCit 6.71\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: David Given <dg@cowlark.com>\n"
 "Language-Team: LANGUAGE <en_GB@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -62,126 +62,115 @@ msgstr ""
 msgid "Aide"
 msgstr ""
 
-#: ../auth.c:65
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr ""
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr ""
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr ""
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr ""
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr ""
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr ""
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr ""
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr ""
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr ""
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
 msgstr ""
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr ""
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr ""
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr ""
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr ""
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr ""
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr ""
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr ""
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr ""
 
-#: ../auth.c:711
+#: ../auth.c:678
 msgid "strong"
 msgstr ""
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr ""
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr ""
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr ""
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr ""
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr ""
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr ""
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -189,11 +178,11 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr ""
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr ""
 
@@ -381,7 +370,7 @@ msgstr ""
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr ""
 
@@ -1057,7 +1046,7 @@ msgid "Move this message to:"
 msgstr ""
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr ""
 
@@ -1099,11 +1088,11 @@ msgstr ""
 msgid "Mailbox view mode"
 msgstr ""
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr ""
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 msgid "I don't know how to display "
 msgstr ""
 
@@ -1784,7 +1773,7 @@ msgstr ""
 msgid "Show empty floors"
 msgstr ""
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr ""
 
@@ -2062,7 +2051,7 @@ msgstr ""
 msgid "Add rule"
 msgstr ""
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr ""
 
@@ -2722,6 +2711,7 @@ msgid "To:"
 msgstr ""
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr ""
 
@@ -2729,7 +2719,9 @@ msgstr ""
 msgid "BCC:"
 msgstr ""
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr ""
 
@@ -2831,7 +2823,7 @@ msgstr ""
 msgid "My folders"
 msgstr ""
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 msgid "powered by"
 msgstr ""
 
@@ -2839,47 +2831,47 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr ""
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr ""
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr ""
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
 msgstr ""
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
 msgstr ""
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "See the"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
@@ -3021,10 +3013,25 @@ msgid "Copy"
 msgstr ""
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr ""
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr ""
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr ""
@@ -3033,6 +3040,18 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr ""
@@ -3406,21 +3425,25 @@ msgstr ""
 msgid "Auto-purge after this many days"
 msgstr ""
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr ""
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+msgid "to"
+msgstr ""
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr ""
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr ""
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr ""
 
diff --git a/webcit/po/es.po b/webcit/po/es.po
index 71821501b..95882a41b 100644
--- a/webcit/po/es.po
+++ b/webcit/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WEBCIT 6.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: 2006-04-13 16:23-0500\n"
 "Last-Translator: Gabriel C. Huertas <gabrielhuertas@terra.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -26,7 +26,7 @@ msgstr "Añadir"
 msgid "Deleted"
 msgstr "Borrado"
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -62,68 +62,48 @@ msgstr "Usuario Preferente"
 msgid "Aide"
 msgstr "Administrador"
 
-#: ../auth.c:65
-#, fuzzy
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-"<ul><li><b>Si ya dispone de una cuenta en %s</b>, introduzca su nombre de "
-"usuario y contraseña y seleccione &quot;Login.&quot; <li><b>Si es un usuario "
-"nuevo</b>, introduzca su nombre y la contraseña que le gustaría utilizar, y "
-"pulse &quot;Nuevo Usuario.&quot; <li>Por favor, cierre su conexión "
-"adecuadamente al terminar. <li>Debe utilizar un explorador que soporte "
-"<i>frames</i> y <i>cookies</i>. <li>Tenga también en cuenta que si su "
-"explorador esta configurado para bloquear pop windows, no podrá recibir "
-"mensajería instantánea.<br /></ul>"
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr ""
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr ""
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr ""
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr "Nombre de usuario:"
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr "Salir"
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr ""
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr "No se permiten contraseñas en blanco"
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr "Su contraseña no ha sido aceptada"
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr "Log off (desconectar)"
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
@@ -132,68 +112,68 @@ msgstr ""
 "servidor Citadel.Por favor, informe de este problema al administrador del "
 "sistema."
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr ""
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr "Iniciar acceso de nuevo"
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr "Cerrar ventana"
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr "Validación de nuevos usuarios"
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr "Ningún usuario requiere validación por el momento"
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr ""
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr ""
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr ""
 
-#: ../auth.c:711
+#: ../auth.c:678
 msgid "strong"
 msgstr ""
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Nivel actual de acceso: %d (%s)\n"
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr "Seleccione el nivel de acceso para este usuario:"
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr "Cambie su contraseña"
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr "Introducir nueva contraseña"
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr "Introdúzcala de nuevo como confirmación:"
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr "Cambia contraseña"
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -201,11 +181,11 @@ msgstr "Cambia contraseña"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr "Cancelado. No se cambió la contraseña."
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr "No cuadran. La contraseña no se cambia."
 
@@ -401,7 +381,7 @@ msgstr "Salvar"
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1112,7 +1092,7 @@ msgid "Move this message to:"
 msgstr "Mover este mensaje a:"
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr "Mover"
 
@@ -1156,11 +1136,11 @@ msgstr ""
 msgid "Mailbox view mode"
 msgstr ""
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr "editar"
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 #, fuzzy
 msgid "I don't know how to display "
 msgstr "No se como mostrar %s"
@@ -1888,7 +1868,7 @@ msgstr "Ver listado de salas"
 msgid "Show empty floors"
 msgstr ""
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr "Responder"
 
@@ -2197,7 +2177,7 @@ msgstr ""
 msgid "Add rule"
 msgstr "Añadir usuarios"
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr "Su confiración de sistema ha sido actualizada"
 
@@ -2896,6 +2876,7 @@ msgid "To:"
 msgstr "A"
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr "CC:"
 
@@ -2903,7 +2884,9 @@ msgstr "CC:"
 msgid "BCC:"
 msgstr "BCC"
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -3015,7 +2998,7 @@ msgstr "cambiar a menú"
 msgid "My folders"
 msgstr "Carpeta de Correo"
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 #, fuzzy
 msgid "powered by"
 msgstr "%s - Motor Citadel"
@@ -3024,48 +3007,48 @@ msgstr "%s - Motor Citadel"
 msgid "Password:"
 msgstr "Contraseña"
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr "Lenguaje"
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr ""
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr ""
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
 msgstr ""
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
 msgstr ""
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 #, fuzzy
 msgid "See the"
 msgstr "Borrar"
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
@@ -3211,10 +3194,25 @@ msgid "Copy"
 msgstr ""
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr "Imprimir"
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr ""
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr "Preferencias y configuración"
@@ -3224,6 +3222,18 @@ msgstr "Preferencias y configuración"
 msgid "Select"
 msgstr "Borrar"
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr ""
@@ -3616,21 +3626,26 @@ msgstr "Fecha y hora de la última conexión"
 msgid "Auto-purge after this many days"
 msgstr "Autopurgar despues de estos muchos dias"
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr "de"
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+#, fuzzy
+msgid "to"
+msgstr "a"
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr "Respuesta entrecomillada"
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr "Cabeceras"
 
@@ -3677,6 +3692,25 @@ msgstr "Usuarios actualmente en %s"
 msgid "(kill)"
 msgstr "(matar)"
 
+#, fuzzy
+#~ msgid ""
+#~ "<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
+#~ "\"http://www.citadel.org/doku.php/documentation:openid\">Click here to "
+#~ "learn what OpenID is and how Citadel is using it.</a><li>Please log off "
+#~ "properly when finished. <li>You must use a browser that supports "
+#~ "<i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your "
+#~ "browser is configured to block pop-up windows, you will not be able to "
+#~ "receive any instant messages.<br></ul>"
+#~ msgstr ""
+#~ "<ul><li><b>Si ya dispone de una cuenta en %s</b>, introduzca su nombre de "
+#~ "usuario y contraseña y seleccione &quot;Login.&quot; <li><b>Si es un "
+#~ "usuario nuevo</b>, introduzca su nombre y la contraseña que le gustaría "
+#~ "utilizar, y pulse &quot;Nuevo Usuario.&quot; <li>Por favor, cierre su "
+#~ "conexión adecuadamente al terminar. <li>Debe utilizar un explorador que "
+#~ "soporte <i>frames</i> y <i>cookies</i>. <li>Tenga también en cuenta que "
+#~ "si su explorador esta configurado para bloquear pop windows, no podrá "
+#~ "recibir mensajería instantánea.<br /></ul>"
+
 #, fuzzy
 #~ msgid ""
 #~ "enter your user name and password and click &quot;Login.&quot;<li><b>If "
@@ -3747,9 +3781,6 @@ msgstr "(matar)"
 #~ msgid "Internet configuration"
 #~ msgstr "Configuración de internet"
 
-#~ msgid "to "
-#~ msgstr "a"
-
 #~ msgid "ReplyAll"
 #~ msgstr "Responder Todos"
 
diff --git a/webcit/po/fr.po b/webcit/po/fr.po
index c5420b010..92272c6cb 100644
--- a/webcit/po/fr.po
+++ b/webcit/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: 2009-01-29 21:49+0100\n"
 "Last-Translator: Thierry Pasquier <thierry.pasquier@emf.ccsti.eu>\n"
 "Language-Team:  <en@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "Ajouter"
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -65,68 +65,50 @@ msgstr "Usager privilégié"
 msgid "Aide"
 msgstr "Administrateur"
 
-#: ../auth.c:65
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr "Votre compte OpenID <tt>%s</tt> a été vérifié avec succès."
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr ""
 "Cependant, le nom d'usager '%s' est en conflit avec celui d'un usager "
 "existant."
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr "SVP précisez le nom d'usager que vous souhaitez utiliser."
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr "Identifiant :"
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr "Quitter"
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr "%s - propulsé par <a href=\"http://www.citadel.org\">Citadel</a>"
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr "Les mots de passe vides ne sont pas autorisés."
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr "Votre mot de passe a été refusé."
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr "Déconnexion"
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
@@ -134,68 +116,68 @@ msgstr ""
 "Ce programme n'a pas pu se connecter ou rester connecté au serveur Citadel. "
 "SVP informez l'administrateur du système de ce problème."
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr "En lire plus..."
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr "Se connecter à nouveau"
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr "Fermer la fenêtre"
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr "Valider les nouveaux usagers"
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr "Aucun usager ne requière de validation actuellement."
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr "très faible"
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr "faible"
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr "ok"
 
-#: ../auth.c:711
+#: ../auth.c:678
 msgid "strong"
 msgstr "strong"
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Niveau d'accès actuel : %d (%s)\n"
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr "Sélection du niveau d'accès de cet usager : "
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr "Changez votre mot de passe"
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr "Entrez un nouveau mot de passe :"
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr "Retapez le pour confirmer :"
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -203,11 +185,11 @@ msgstr "Changer le mot de passe"
 msgid "Cancel"
 msgstr "Abandonner"
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr "Abandon. Le mot de passe n'a pas été changé."
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr ""
 "Les deux saisies sont différentes. Le mot de passe n'a pas été modifié."
@@ -404,7 +386,7 @@ msgstr "Enregistrer"
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1095,7 +1077,7 @@ msgid "Move this message to:"
 msgstr "Déplacer ce message vers :"
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr "Déplacer"
 
@@ -1138,11 +1120,11 @@ msgstr ""
 msgid "Mailbox view mode"
 msgstr "Mode d'affichage"
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr "modifier"
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 msgid "I don't know how to display "
 msgstr "Je ne sais pas comment afficher "
 
@@ -1857,7 +1839,7 @@ msgstr "Visualisation des paliers et salons"
 msgid "Show empty floors"
 msgstr "Montrer les niveaux vides"
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr "Répondre"
 
@@ -2148,7 +2130,7 @@ msgstr "et ensuite"
 msgid "Add rule"
 msgstr "Ajouter une règle"
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr "La configuration de votre système a été mise à jour"
 
@@ -2841,6 +2823,7 @@ msgid "To:"
 msgstr "À :"
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr "Copie conforme :"
 
@@ -2848,7 +2831,9 @@ msgstr "Copie conforme :"
 msgid "BCC:"
 msgstr "Copie cachée à :"
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr "Objet :"
 
@@ -2955,7 +2940,7 @@ msgstr "passer au menu"
 msgid "My folders"
 msgstr "Dossier de messages"
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 msgid "powered by"
 msgstr "motorisé par"
 
@@ -2963,52 +2948,52 @@ msgstr "motorisé par"
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr "Langue :"
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr "Se connecter en utilisant OpenID"
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr "Si vous avez déjà un compte sur"
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
-msgstr ""
+msgstr "entrez votre identifiant et votre mot de passe puis cliquez sur &quot;Login.&quot;"
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
-msgstr ""
+msgstr "<b>Si ous êtes un nouvel usager</b>, entrez l'identifiant et le mot de passe que vous souhaitez utiliser et cliquez sur &quot;Nouvel usager.&quot; "
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
-msgstr ""
+msgstr "Fermez votre session  proprement en quittant."
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 #, fuzzy
 msgid "See the"
 msgstr "Supprimer"
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
-msgstr ""
+msgstr "Gardez aussi à l'esprit que si votre navigateur est configuré pour bloquer les pop-ups intempestives vous ne recevrez aucun message instantané."
 
 #: ../static/t/menu_advanced_roomcommands.html:3
 msgid "Edit or delete this room"
@@ -3146,10 +3131,25 @@ msgid "Copy"
 msgstr "Copier"
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr "Imprimer"
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr ""
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr "Préférences et options"
@@ -3158,6 +3158,18 @@ msgstr "Préférences et options"
 msgid "Select"
 msgstr "Sélectionner"
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr "Diaporama"
@@ -3546,21 +3558,26 @@ msgstr "Date et heure de la dernière connexion"
 msgid "Auto-purge after this many days"
 msgstr "Purge automatique après ce nombre de jours"
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr "de "
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+#, fuzzy
+msgid "to"
+msgstr "à "
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr "Répondre en citant"
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr "Entêtes"
 
@@ -3603,6 +3620,23 @@ msgstr "Usagers actuellement dans"
 msgid "(kill)"
 msgstr "(supprimer)"
 
+#~ msgid ""
+#~ "<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
+#~ "\"http://www.citadel.org/doku.php/documentation:openid\">Click here to "
+#~ "learn what OpenID is and how Citadel is using it.</a><li>Please log off "
+#~ "properly when finished. <li>You must use a browser that supports "
+#~ "<i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your "
+#~ "browser is configured to block pop-up windows, you will not be able to "
+#~ "receive any instant messages.<br></ul>"
+#~ msgstr ""
+#~ "<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
+#~ "\"http://www.citadel.org/doku.php/documentation:openid\">Click here to "
+#~ "learn what OpenID is and how Citadel is using it.</a><li>Please log off "
+#~ "properly when finished. <li>You must use a browser that supports "
+#~ "<i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your "
+#~ "browser is configured to block pop-up windows, you will not be able to "
+#~ "receive any instant messages.<br></ul>"
+
 #, fuzzy
 #~ msgid ""
 #~ "enter your user name and password and click &quot;Login.&quot;<li><b>If "
@@ -3678,9 +3712,6 @@ msgstr "(supprimer)"
 #~ "Le serveur Citadel doit redémarrer. Il sera de nouveau en service dans "
 #~ "une minute"
 
-#~ msgid "to "
-#~ msgstr "à "
-
 #~ msgid "ReplyAll"
 #~ msgstr "Répondre à tous"
 
diff --git a/webcit/po/it.po b/webcit/po/it.po
index beca0184d..c603f2497 100644
--- a/webcit/po/it.po
+++ b/webcit/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: 2006-12-20 14:18+0100\n"
 "Last-Translator: Gabriele Tassoni <gabriele.tassoni@email.it>\n"
 "Language-Team: italian <it@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Aggiungi"
 msgid "Deleted"
 msgstr "Cancellato"
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -63,68 +63,48 @@ msgstr "Utente Preferito"
 msgid "Aide"
 msgstr "Amministratore"
 
-#: ../auth.c:65
-#, fuzzy
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-"<ul><li><b>Se hai gi&agrave; un account su %s</b>, fornisci il tuo nome "
-"utente e la tua password e clicca su &quot;Login.&quot; <li><b>Se sei un "
-"nuovo utente</b>, fornisci il nome utente e la password che vorresti e "
-"clicca su &quot;Nuovo Utente.&quot; <li>Per favore, eseguire il logout in "
-"maniera corretta prima di uscire. <li>Devi usare un Browser che supporti i  "
-"<i>frames</i> e i <i>cookies</i>. <li>Tieni anche a mente che se il tuo "
-"browser &egrave; configurato per bloccare le finestre di pop up, non "
-"riuscirai a ricevere nessun messaggio istantaneo.<br /></ul>"
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr ""
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr ""
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr ""
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr "Nome utente:"
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr "Uscita"
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr ""
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr "Le password vuote non sono ammesse."
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr "La tua password non &egrave; stata accettata."
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr "Esci"
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
@@ -132,69 +112,69 @@ msgstr ""
 "Questo programma non riesce a collegarsi o a rimanere collegato al server "
 "Citadel. Per favore, segnala questo errore all'amministratore di sistema."
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr ""
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr "Esegui nuovamente il Log in"
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr "Chiudi la finestra"
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr "Valida il nuovo utente"
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr "Non si richiede l'autenticazione utente in questo momento"
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr ""
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr ""
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr ""
 
-#: ../auth.c:711
+#: ../auth.c:678
 #, fuzzy
 msgid "strong"
 msgstr "ferma"
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Attuale livello di accesso: %d (%s)\n"
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr "Seleziona il livello di accesso per l'utente corrente:"
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr "Cambia la tua password"
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr "Inserisci la nuova password:"
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr "Inseriscila nuovamente per conferma:"
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr "Cambia la password"
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -202,11 +182,11 @@ msgstr "Cambia la password"
 msgid "Cancel"
 msgstr "Cancella"
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr "Aziona cancellata. La password non &egrave; stata cambiata. "
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr "Le password non coincidono. Cambiamento non effettuato."
 
@@ -409,7 +389,7 @@ msgstr "Salva"
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr "Cancella"
 
@@ -1119,7 +1099,7 @@ msgid "Move this message to:"
 msgstr "Sposta questo messaggio in:"
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr "Sposta"
 
@@ -1163,11 +1143,11 @@ msgstr ""
 msgid "Mailbox view mode"
 msgstr ""
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr "Modifica"
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 #, fuzzy
 msgid "I don't know how to display "
 msgstr "Non so come mostrare %s"
@@ -1896,7 +1876,7 @@ msgstr "Vista della lista delle stanze"
 msgid "Show empty floors"
 msgstr ""
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr "Rispondi"
 
@@ -2183,7 +2163,7 @@ msgstr "e poi"
 msgid "Add rule"
 msgstr "Aggiungi utenti"
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr "La configurazione del tuo sistema è stata aggiornata"
 
@@ -2876,6 +2856,7 @@ msgid "To:"
 msgstr "A:"
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr "CC:"
 
@@ -2883,7 +2864,9 @@ msgstr "CC:"
 msgid "BCC:"
 msgstr "BCC:"
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr "Oggetto:"
 
@@ -2995,7 +2978,7 @@ msgstr "Visualizza il menu"
 msgid "My folders"
 msgstr "Cartella di Posta"
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 #, fuzzy
 msgid "powered by"
 msgstr "%s - potenziato da Citadel"
@@ -3004,48 +2987,48 @@ msgstr "%s - potenziato da Citadel"
 msgid "Password:"
 msgstr "Password:"
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr "Lingua:"
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr ""
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr ""
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
 msgstr ""
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
 msgstr ""
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 #, fuzzy
 msgid "See the"
 msgstr "Cancella"
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
@@ -3191,10 +3174,25 @@ msgid "Copy"
 msgstr ""
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr "Stampa"
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr ""
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr "Preferenze e impostazioni"
@@ -3204,6 +3202,18 @@ msgstr "Preferenze e impostazioni"
 msgid "Select"
 msgstr "Cancella"
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr ""
@@ -3598,21 +3608,26 @@ msgstr "Data e giorno dell'ultimo accesso"
 msgid "Auto-purge after this many days"
 msgstr "Auto elimina dopo questo numero di giorni"
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr "da"
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+#, fuzzy
+msgid "to"
+msgstr "a"
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr "Rispondi con cronistoria"
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr "Inoltra"
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr "Intestazione"
 
@@ -3659,6 +3674,25 @@ msgstr "Utenti attualmente su %s"
 msgid "(kill)"
 msgstr "(termina)"
 
+#, fuzzy
+#~ msgid ""
+#~ "<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
+#~ "\"http://www.citadel.org/doku.php/documentation:openid\">Click here to "
+#~ "learn what OpenID is and how Citadel is using it.</a><li>Please log off "
+#~ "properly when finished. <li>You must use a browser that supports "
+#~ "<i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your "
+#~ "browser is configured to block pop-up windows, you will not be able to "
+#~ "receive any instant messages.<br></ul>"
+#~ msgstr ""
+#~ "<ul><li><b>Se hai gi&agrave; un account su %s</b>, fornisci il tuo nome "
+#~ "utente e la tua password e clicca su &quot;Login.&quot; <li><b>Se sei un "
+#~ "nuovo utente</b>, fornisci il nome utente e la password che vorresti e "
+#~ "clicca su &quot;Nuovo Utente.&quot; <li>Per favore, eseguire il logout in "
+#~ "maniera corretta prima di uscire. <li>Devi usare un Browser che supporti "
+#~ "i  <i>frames</i> e i <i>cookies</i>. <li>Tieni anche a mente che se il "
+#~ "tuo browser &egrave; configurato per bloccare le finestre di pop up, non "
+#~ "riuscirai a ricevere nessun messaggio istantaneo.<br /></ul>"
+
 #, fuzzy
 #~ msgid ""
 #~ "enter your user name and password and click &quot;Login.&quot;<li><b>If "
@@ -3729,9 +3763,6 @@ msgstr "(termina)"
 #~ msgid "Internet configuration"
 #~ msgstr "Configurazione internet"
 
-#~ msgid "to "
-#~ msgstr "a"
-
 #~ msgid "ReplyAll"
 #~ msgstr "Rispondi A Tutti"
 
diff --git a/webcit/po/nl.po b/webcit/po/nl.po
index cda56b4cb..196482c0a 100644
--- a/webcit/po/nl.po
+++ b/webcit/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: 2009-01-28 21:56+0100\n"
 "Last-Translator: Wim Kuilman\n"
 "Language-Team: Dutch <kde-i18n-doc@lists.kde.org>\n"
@@ -29,7 +29,7 @@ msgstr "Toevoegen"
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -65,65 +65,48 @@ msgstr "Voorkeursgebruiker"
 msgid "Aide"
 msgstr "Beheerder"
 
-#: ../auth.c:65
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-"<ul><li>Tik uw OpenID URL in en klik op &quot;Inloggen.&quot; <li><b><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Klik hier voor meer "
-"info over OpenID en hoe Citadel het gebruikt.</a><li>Log correct uit als u "
-"klaar bent. <li>Uw browser moet <i>frames</i> en <i>cookies</i> "
-"ondersteunen. <li>Als uw browser pop-up vensters blokkeert, zult u geen "
-"directe berichten kunnen ontvangen.<br /></ul>"
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr "Uw OpenID <tt>%s</tt> is geverifieerd."
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr "Maar, de gebruikersnaam '%s' botst met een bestaande gebruiker."
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr "Geef alstublieft de gebruikersnaam die u wilt gebruiken."
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr "Gebruikersnaam: "
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr "Stoppen"
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr "%s - op basis van <a href=\"http://www.citadel.org\">Citadel</a>"
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr "Wachtwoorden mogen niet leeg zijn."
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr "Uw wachtwoord is niet geaccepteerd."
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr "Uitloggen"
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
@@ -131,68 +114,68 @@ msgstr ""
 "Dit programma was niet in staat om contact te maken - of te houden met de "
 "Citadel server. Meld dit probleem alstublieft bij uw systeembeheerder."
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr "Lees verder..."
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr "Opnieuw inloggen"
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr "Venster sluiten"
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr "Nieuwe gebruikers goedkeuren"
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr "Er zijn geen gebruikers die goedgekeurd moeten worden."
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr "erg zwak"
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr "zwak"
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr "ok"
 
-#: ../auth.c:711
+#: ../auth.c:678
 msgid "strong"
 msgstr "sterk"
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Huidig toegangsniveau %d (%s)\n"
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr "Selecteer toegangsniveau voor deze gebruiker: "
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr "Uw wachtwoord wijzigen"
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr "Uw nieuwe wachtwoord: "
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr "Nogmaals als bevestiging: "
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -200,11 +183,11 @@ msgstr "Wachtwoord wijzigen"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr "Geannuleerd: Wachtwoord niet gewijzigd."
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr "Ze komen niet overeen. Wachtwoord is niet gewijzigd."
 
@@ -402,7 +385,7 @@ msgstr "Bewaren"
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -1097,7 +1080,7 @@ msgid "Move this message to:"
 msgstr "Dit bericht verplaatsen naar: "
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr "Verplaatsen"
 
@@ -1139,11 +1122,11 @@ msgstr "Voorkeursnaam voor bulletinboard berichten"
 msgid "Mailbox view mode"
 msgstr "Mailboxweergave"
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr "bewerken"
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 msgid "I don't know how to display "
 msgstr "Ik weet niet hoe ik moet tonen"
 
@@ -1855,7 +1838,7 @@ msgstr "Bekijk als ruimte"
 msgid "Show empty floors"
 msgstr "Toon lege verdiepingen"
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr "Antwoord"
 
@@ -2144,7 +2127,7 @@ msgstr "en dan"
 msgid "Add rule"
 msgstr "Voeg regel toe"
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr "Uw systeeminstellingen zijn bijgewerkt."
 
@@ -2834,6 +2817,7 @@ msgid "To:"
 msgstr "Naar: "
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr "CC: "
 
@@ -2841,7 +2825,9 @@ msgstr "CC: "
 msgid "BCC:"
 msgstr "BCC: "
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr "Onderwerp: "
 
@@ -2946,7 +2932,7 @@ msgstr "Switch naar menu"
 msgid "My folders"
 msgstr "Mailmap"
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 msgid "powered by"
 msgstr "op basis van "
 
@@ -2954,56 +2940,57 @@ msgstr "op basis van "
 msgid "Password:"
 msgstr "Wachtwoord: "
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr "Taal: "
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr "Login met OpenID"
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr "als u al een account heeft op "
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
-msgstr "Vul uw gebruikersnaam en wachtwoord in en klik op &quot;Inloggen.&quot;"
+msgstr ""
+"Vul uw gebruikersnaam en wachtwoord in en klik op &quot;Inloggen.&quot;"
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
 msgstr ""
-"<b>Als u een nieuwe gebruiker bent</b>, vul uw gebruikersnaam in en "
-"het wachtwoord dat u wilt gebruiken en klik op &quot;Nieuwe gebruiker."
+"<b>Als u een nieuwe gebruiker bent</b>, vul uw gebruikersnaam in en het "
+"wachtwoord dat u wilt gebruiken en klik op &quot;Nieuwe gebruiker."
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
 msgstr "Log correct uit als u klaar bent."
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 #, fuzzy
 msgid "See the"
 msgstr "Verwijderen"
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
 msgstr ""
-"Als uw browser pop-up "
-"vensters blokkeert, zult u geen directe berichten kunnen ontvangen."
+"Als uw browser pop-up vensters blokkeert, zult u geen directe berichten "
+"kunnen ontvangen."
 
 #: ../static/t/menu_advanced_roomcommands.html:3
 msgid "Edit or delete this room"
@@ -3141,10 +3128,27 @@ msgid "Copy"
 msgstr "Kopieer"
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr "Print"
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+#, fuzzy
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+"Vul uw gebruikersnaam en wachtwoord in en klik op &quot;Inloggen.&quot;"
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr "Klik hier voor meer info over OpenID en hoe Citadel het gebruikt."
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr "Voorkeuren en instellingen"
@@ -3153,6 +3157,18 @@ msgstr "Voorkeuren en instellingen"
 msgid "Select"
 msgstr "Selecteren"
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr "Diashow"
@@ -3534,21 +3550,26 @@ msgstr "Datum en tijd laatste login"
 msgid "Auto-purge after this many days"
 msgstr "Opruimen na dit aantal dagen"
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr "van "
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+#, fuzzy
+msgid "to"
+msgstr "aan "
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr "AntwoordQuoted"
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr "Headers"
 
@@ -3589,6 +3610,22 @@ msgstr "Gebruikers op dit moment op "
 msgid "(kill)"
 msgstr "(beëindig)"
 
+#~ msgid ""
+#~ "<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
+#~ "\"http://www.citadel.org/doku.php/documentation:openid\">Click here to "
+#~ "learn what OpenID is and how Citadel is using it.</a><li>Please log off "
+#~ "properly when finished. <li>You must use a browser that supports "
+#~ "<i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your "
+#~ "browser is configured to block pop-up windows, you will not be able to "
+#~ "receive any instant messages.<br></ul>"
+#~ msgstr ""
+#~ "<ul><li>Tik uw OpenID URL in en klik op &quot;Inloggen.&quot; <li><b><a "
+#~ "href=\"http://www.citadel.org/doku.php/documentation:openid\">Klik hier "
+#~ "voor meer info over OpenID en hoe Citadel het gebruikt.</a><li>Log "
+#~ "correct uit als u klaar bent. <li>Uw browser moet <i>frames</i> en "
+#~ "<i>cookies</i> ondersteunen. <li>Als uw browser pop-up vensters "
+#~ "blokkeert, zult u geen directe berichten kunnen ontvangen.<br /></ul>"
+
 #~ msgid ""
 #~ "enter your user name and password and click &quot;Login.&quot;<li><b>If "
 #~ "you are a new user</b>, enter the name and password you wish to use, and "
@@ -3659,9 +3696,6 @@ msgstr "(beëindig)"
 #~ msgstr ""
 #~ "De Citadel server moet opnieuw opstarten. Het is zo weer beschikbaar."
 
-#~ msgid "to "
-#~ msgstr "aan "
-
 #~ msgid "ReplyAll"
 #~ msgstr "AntwoordAllen"
 
diff --git a/webcit/po/pt_BR.po b/webcit/po/pt_BR.po
index aab04013a..07eba5162 100644
--- a/webcit/po/pt_BR.po
+++ b/webcit/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: 2008-04-22 23:35-0300\n"
 "Last-Translator: Marco Gonçalves\n"
 "Language-Team:  <en@li.org>\n"
@@ -28,7 +28,7 @@ msgstr "Adicionar "
 msgid "Deleted"
 msgstr "Excluído"
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -64,67 +64,48 @@ msgstr "Usuário preferencial"
 msgid "Aide"
 msgstr "Aide"
 
-#: ../auth.c:65
-#, fuzzy
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-"<ul><li><b>Se você já tem uma conta em %s</b>, digite seu nome de usuário e "
-"senha e clique em &quot;Login.&quot; <li><b>Se você for um novo usuário</b>, "
-"digite o nome de usuário e senha desejados, e clique em &quot;Novo Usuário "
-"&quot; <li>Se possível, faça o &quot;log off &quot; quando terminar de usar "
-"o sistema. <li> Seu navegador deverá suportar <i>frames</i> e <i>cookies</"
-"i>. <li>Se seu browser estiver configurado para bloquear <i>pop-ups</i>, "
-"você não poderá receber mensagens instantâneas.<br /></ul>"
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr ""
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr ""
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr ""
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr "Nome do usuário:"
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr "Sair"
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr "Senhas em branco não são permitidas."
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr "Sua senha não foi aceita"
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr "Log off"
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
@@ -133,69 +114,69 @@ msgstr ""
 "Citadel.  Se possível, reporte esse problema para seu administrador de "
 "sistema."
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr "Continuar..."
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr "Refazer log in"
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr "Fechar janela "
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr "Validar novos usuários"
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr "Sem usuários para validar no momento"
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr ""
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr ""
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr ""
 
-#: ../auth.c:711
+#: ../auth.c:678
 #, fuzzy
 msgid "strong"
 msgstr "parar"
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Nível de acesso atual: %d (%s)\n"
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr "Selecione o nível de acesso para esse usuário:"
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr "Modificar sua senha"
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr "Digite nova senha:"
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr "Digite novamente para confirmar:"
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr "Modificar senha"
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -203,11 +184,11 @@ msgstr "Modificar senha"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr "Cancelado.  A senha não foi modificada. "
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr "Eles não batem.  Senha não foi modificada."
 
@@ -406,7 +387,7 @@ msgstr "Salvar"
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr "Excluir"
 
@@ -1108,7 +1089,7 @@ msgid "Move this message to:"
 msgstr "Mover essa mensagem para:"
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr "Mover"
 
@@ -1152,11 +1133,11 @@ msgstr ""
 msgid "Mailbox view mode"
 msgstr ""
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr "editar"
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 #, fuzzy
 msgid "I don't know how to display "
 msgstr "Eu não sei como exibir %s"
@@ -1880,7 +1861,7 @@ msgstr "Visualização lista de salas"
 msgid "Show empty floors"
 msgstr "Exibir andares vazios"
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr "Responder"
 
@@ -2170,7 +2151,7 @@ msgstr "e depois"
 msgid "Add rule"
 msgstr "Adicionar regra"
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr "Sua configuração do sistema foi atualizada."
 
@@ -2863,6 +2844,7 @@ msgid "To:"
 msgstr "Para:"
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr "CC:"
 
@@ -2870,7 +2852,9 @@ msgstr "CC:"
 msgid "BCC:"
 msgstr "BCC:"
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr "Assunto:"
 
@@ -2979,7 +2963,7 @@ msgstr "mudar para menu"
 msgid "My folders"
 msgstr "Pasta para Correio"
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 msgid "powered by"
 msgstr ""
 
@@ -2987,48 +2971,48 @@ msgstr ""
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr "Idioma:"
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr ""
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr ""
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
 msgstr ""
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
 msgstr ""
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 #, fuzzy
 msgid "See the"
 msgstr "Excluir"
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
@@ -3173,10 +3157,25 @@ msgid "Copy"
 msgstr ""
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr "Imprimir"
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr ""
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr "Preferências e configurações"
@@ -3186,6 +3185,18 @@ msgstr "Preferências e configurações"
 msgid "Select"
 msgstr "Excluir"
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr "Apresentação"
@@ -3575,21 +3586,26 @@ msgstr "Data e hora do último login"
 msgid "Auto-purge after this many days"
 msgstr "Excluir automaticamente após essa quantidade de dias"
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr "de "
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+#, fuzzy
+msgid "to"
+msgstr "para "
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr "ResponderComCitação"
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr "Cabeçalhos"
 
@@ -3636,6 +3652,25 @@ msgstr "Usuários atualmente em %s"
 msgid "(kill)"
 msgstr "(terminar)"
 
+#, fuzzy
+#~ msgid ""
+#~ "<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
+#~ "\"http://www.citadel.org/doku.php/documentation:openid\">Click here to "
+#~ "learn what OpenID is and how Citadel is using it.</a><li>Please log off "
+#~ "properly when finished. <li>You must use a browser that supports "
+#~ "<i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your "
+#~ "browser is configured to block pop-up windows, you will not be able to "
+#~ "receive any instant messages.<br></ul>"
+#~ msgstr ""
+#~ "<ul><li><b>Se você já tem uma conta em %s</b>, digite seu nome de usuário "
+#~ "e senha e clique em &quot;Login.&quot; <li><b>Se você for um novo "
+#~ "usuário</b>, digite o nome de usuário e senha desejados, e clique em "
+#~ "&quot;Novo Usuário &quot; <li>Se possível, faça o &quot;log off &quot; "
+#~ "quando terminar de usar o sistema. <li> Seu navegador deverá suportar "
+#~ "<i>frames</i> e <i>cookies</i>. <li>Se seu browser estiver configurado "
+#~ "para bloquear <i>pop-ups</i>, você não poderá receber mensagens "
+#~ "instantâneas.<br /></ul>"
+
 #, fuzzy
 #~ msgid ""
 #~ "enter your user name and password and click &quot;Login.&quot;<li><b>If "
@@ -3709,9 +3744,6 @@ msgstr "(terminar)"
 #~ msgid "The citadel server has to be restarted. It 'll be back in a minute."
 #~ msgstr "O servidor Citadel deverá ser reiniciado, Ele voltará em um minuto."
 
-#~ msgid "to "
-#~ msgstr "para "
-
 #~ msgid "ReplyAll"
 #~ msgstr "ResponderTodos"
 
diff --git a/webcit/po/webcit.pot b/webcit/po/webcit.pot
index a5377ef68..c59cde618 100644
--- a/webcit/po/webcit.pot
+++ b/webcit/po/webcit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 16:32-0500\n"
+"POT-Creation-Date: 2009-01-31 18:13+1100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: ../auth.c:22 ../auth.c:123 ../static/t/tab_siteconfig_access.html:10
+#: ../auth.c:22 ../auth.c:90 ../static/t/tab_siteconfig_access.html:10
 #: ../static/t/tab_siteconfig_access.html:36
 #: ../static/t/userlist_detailview.html:23
 msgid "New User"
@@ -63,126 +63,115 @@ msgstr ""
 msgid "Aide"
 msgstr ""
 
-#: ../auth.c:65
-msgid ""
-"<ul><li>Enter your OpenID URL and click &quot;Login&quot;.<li><a href="
-"\"http://www.citadel.org/doku.php/documentation:openid\">Click here to learn "
-"what OpenID is and how Citadel is using it.</a><li>Please log off properly "
-"when finished. <li>You must use a browser that supports <i>frames</i> and "
-"<i>cookies</i>. <li>Also keep in mind that if your browser is configured to "
-"block pop-up windows, you will not be able to receive any instant messages."
-"<br></ul>"
-msgstr ""
-
-#: ../auth.c:103
+#: ../auth.c:70
 #, c-format
 msgid "Your OpenID <tt>%s</tt> was successfully verified."
 msgstr ""
 
-#: ../auth.c:112
+#: ../auth.c:79
 #, c-format
 msgid "However, the user name '%s' conflicts with an existing user."
 msgstr ""
 
-#: ../auth.c:120
+#: ../auth.c:87
 msgid "Please specify the user name you would like to use."
 msgstr ""
 
-#: ../auth.c:122 ../who.c:190 ../static/t/login.html:16
+#: ../auth.c:89 ../who.c:190 ../static/t/login.html:16
 #: ../static/t/userlist_detailview.html:16
 msgid "User name:"
 msgstr ""
 
-#: ../auth.c:124 ../paging.c:497
+#: ../auth.c:91 ../paging.c:497
 msgid "Exit"
 msgstr ""
 
-#: ../auth.c:126
+#: ../auth.c:93
 #, c-format
 msgid "%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"
 msgstr ""
 
-#: ../auth.c:245 ../auth.c:873
+#: ../auth.c:212 ../auth.c:840
 msgid "Blank passwords are not allowed."
 msgstr ""
 
-#: ../auth.c:279 ../auth.c:369 ../auth.c:476
+#: ../auth.c:246 ../auth.c:336 ../auth.c:443
 msgid "Your password was not accepted."
 msgstr ""
 
-#: ../auth.c:583 ../static/t/iconbar.html:77
+#: ../auth.c:550 ../static/t/iconbar.html:77
 #: ../static/t/menu_basic_commands.html:19
 msgid "Log off"
 msgstr ""
 
-#: ../auth.c:596
+#: ../auth.c:563
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
 msgstr ""
 
-#: ../auth.c:602
+#: ../auth.c:569
 msgid "Read More..."
 msgstr ""
 
-#: ../auth.c:607
+#: ../auth.c:574
 msgid "Log in again"
 msgstr ""
 
-#: ../auth.c:610 ../roomops.c:328
+#: ../auth.c:577 ../roomops.c:328
 msgid "Close window"
 msgstr ""
 
-#: ../auth.c:630 ../static/t/aide_usermanagement.html:3
+#: ../auth.c:597 ../static/t/aide_usermanagement.html:3
 msgid "Validate new users"
 msgstr ""
 
-#: ../auth.c:653
+#: ../auth.c:620
 msgid "No users require validation at this time."
 msgstr ""
 
-#: ../auth.c:701
+#: ../auth.c:668
 msgid "very weak"
 msgstr ""
 
-#: ../auth.c:704
+#: ../auth.c:671
 msgid "weak"
 msgstr ""
 
-#: ../auth.c:707
+#: ../auth.c:674
 msgid "ok"
 msgstr ""
 
-#: ../auth.c:711
+#: ../auth.c:678
 msgid "strong"
 msgstr ""
 
-#: ../auth.c:729
+#: ../auth.c:696
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr ""
 
-#: ../auth.c:737
+#: ../auth.c:704
 msgid "Select access level for this user:"
 msgstr ""
 
-#: ../auth.c:799 ../static/t/menu_your_info.html:4
+#: ../auth.c:766 ../static/t/menu_your_info.html:4
 msgid "Change your password"
 msgstr ""
 
-#: ../auth.c:823
+#: ../auth.c:790
 msgid "Enter new password:"
 msgstr ""
 
-#: ../auth.c:827
+#: ../auth.c:794
 msgid "Enter it again to confirm:"
 msgstr ""
 
-#: ../auth.c:833
+#: ../auth.c:800
 msgid "Change password"
 msgstr ""
 
-#: ../auth.c:835 ../calendar.c:747 ../event.c:719 ../graphics.c:58
+#: ../auth.c:802 ../calendar.c:747 ../event.c:719 ../graphics.c:58
 #: ../iconbar.c:391 ../mainmenu.c:250 ../messages.c:1467 ../notes.c:87
 #: ../paging.c:55 ../roomops.c:1541 ../roomops.c:1909 ../roomops.c:2589
 #: ../roomops.c:2748 ../roomops.c:2813 ../sieve.c:209 ../sysmsgs.c:52
@@ -190,11 +179,11 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../auth.c:854
+#: ../auth.c:821
 msgid "Cancelled.  Password was not changed."
 msgstr ""
 
-#: ../auth.c:865
+#: ../auth.c:832
 msgid "They don't match.  Password was not changed."
 msgstr ""
 
@@ -382,7 +371,7 @@ msgstr ""
 
 #: ../calendar.c:746 ../event.c:717 ../static/t/msg_listview.html:30
 #: ../static/t/section_aide_inetconf_entry.html:7
-#: ../static/t/view_message.html:29 ../static/t/view_message_print.html:20
+#: ../static/t/view_message.html:29
 msgid "Delete"
 msgstr ""
 
@@ -1058,7 +1047,7 @@ msgid "Move this message to:"
 msgstr ""
 
 #: ../messages.c:1465 ../static/t/msg_listview.html:28
-#: ../static/t/view_message.html:27 ../static/t/view_message_print.html:18
+#: ../static/t/view_message.html:27
 msgid "Move"
 msgstr ""
 
@@ -1100,11 +1089,11 @@ msgstr ""
 msgid "Mailbox view mode"
 msgstr ""
 
-#: ../msg_renderers.c:491 ../vcard_edit.c:71 ../static/t/whosection.html:6
+#: ../msg_renderers.c:492 ../vcard_edit.c:71 ../static/t/whosection.html:6
 msgid "edit"
 msgstr ""
 
-#: ../msg_renderers.c:905
+#: ../msg_renderers.c:906
 msgid "I don't know how to display "
 msgstr ""
 
@@ -1785,7 +1774,7 @@ msgstr ""
 msgid "Show empty floors"
 msgstr ""
 
-#: ../rss.c:30 ../static/t/view_message_print.html:12
+#: ../rss.c:30
 msgid "Reply"
 msgstr ""
 
@@ -2063,7 +2052,7 @@ msgstr ""
 msgid "Add rule"
 msgstr ""
 
-#: ../siteconfig.c:242
+#: ../siteconfig.c:243
 msgid "Your system configuration has been updated."
 msgstr ""
 
@@ -2723,6 +2712,7 @@ msgid "To:"
 msgstr ""
 
 #: ../static/t/edit_message.html:59 ../static/t/view_message.html:14
+#: ../static/t/view_message_print.html:15
 msgid "CC:"
 msgstr ""
 
@@ -2730,7 +2720,9 @@ msgstr ""
 msgid "BCC:"
 msgstr ""
 
-#: ../static/t/edit_message.html:73
+#: ../static/t/edit_message.html:73 ../static/t/view_message.html:35
+#: ../static/t/view_message_print.html:18
+#: ../static/t/view_message_replyquote.html:8
 msgid "Subject:"
 msgstr ""
 
@@ -2832,7 +2824,7 @@ msgstr ""
 msgid "My folders"
 msgstr ""
 
-#: ../static/t/login.html:5
+#: ../static/t/login.html:5 ../static/t/openid_login.html:5
 msgid "powered by"
 msgstr ""
 
@@ -2840,47 +2832,47 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: ../static/t/login.html:20
+#: ../static/t/login.html:20 ../static/t/openid_login.html:18
 msgid "Language:"
 msgstr ""
 
-#: ../static/t/login.html:41
+#: ../static/t/login.html:36
 msgid "Log in using OpenID"
 msgstr ""
 
-#: ../static/t/login.html:45
+#: ../static/t/login.html:40
 msgid "If you already have an account on"
 msgstr ""
 
-#: ../static/t/login.html:46
+#: ../static/t/login.html:41
 msgid "enter your user name and password and click &quot;Login.&quot;"
 msgstr ""
 
-#: ../static/t/login.html:47
+#: ../static/t/login.html:42
 msgid ""
 "<b>If you are a new user</b>, enter the name and password you wish to use, "
 "and click &quot;New User.&quot; "
 msgstr ""
 
-#: ../static/t/login.html:48
+#: ../static/t/login.html:43 ../static/t/openid_login.html:37
 msgid "Please log off properly when finished. "
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "See the"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid "recommended browser list"
 msgstr ""
 
-#: ../static/t/login.html:49
+#: ../static/t/login.html:44 ../static/t/openid_login.html:38
 msgid ""
 "if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> "
 "turned on. "
 msgstr ""
 
-#: ../static/t/login.html:50
+#: ../static/t/login.html:45 ../static/t/openid_login.html:39
 msgid ""
 "Also keep in mind that if your browser is configured to block pop-up "
 "windows, you will not be able to receive any instant messages."
@@ -3022,10 +3014,25 @@ msgid "Copy"
 msgstr ""
 
 #: ../static/t/msg_listview.html:31 ../static/t/view_message.html:33
-#: ../static/t/view_message_print.html:24
 msgid "Print"
 msgstr ""
 
+#: ../static/t/openid_login.html:16
+msgid "OpenID URL:"
+msgstr ""
+
+#: ../static/t/openid_login.html:31
+msgid "Log in using a user name and password"
+msgstr ""
+
+#: ../static/t/openid_login.html:34
+msgid "Enter your OpenID URL and click &quot;Login&quot;."
+msgstr ""
+
+#: ../static/t/openid_login.html:36
+msgid "Click here to learn what OpenID is and how Citadel is using it."
+msgstr ""
+
 #: ../static/t/preferences.html:4 ../static/t/preferences.html:7
 msgid "Preferences and settings"
 msgstr ""
@@ -3034,6 +3041,18 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+#: ../static/t/roombanner.html:15
+msgid ")> <select id="
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid "><option> </option></select></li><??("
+msgstr ""
+
+#: ../static/t/roombanner.html:15
+msgid ",1)>"
+msgstr ""
+
 #: ../static/t/section_files_onefile.html:19
 msgid "Slideshow"
 msgstr ""
@@ -3407,21 +3426,25 @@ msgstr ""
 msgid "Auto-purge after this many days"
 msgstr ""
 
-#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:7
+#: ../static/t/view_message.html:7 ../static/t/view_message_print.html:8
 #: ../static/t/view_message_replyquote.html:4
 #: ../static/t/view_submessage.html:4
 msgid "from "
 msgstr ""
 
-#: ../static/t/view_message.html:23 ../static/t/view_message_print.html:14
+#: ../static/t/view_message.html:13 ../static/t/view_message_print.html:14
+msgid "to"
+msgstr ""
+
+#: ../static/t/view_message.html:23
 msgid "ReplyQuoted"
 msgstr ""
 
-#: ../static/t/view_message.html:25 ../static/t/view_message_print.html:16
+#: ../static/t/view_message.html:25
 msgid "Forward"
 msgstr ""
 
-#: ../static/t/view_message.html:31 ../static/t/view_message_print.html:22
+#: ../static/t/view_message.html:31
 msgid "Headers"
 msgstr ""
 
diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 913a389df..e628a6c66 100644
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -247,6 +247,7 @@ function CtdlMessageListClick(evt) {
   if (!event.shiftKey && !event.ctrlKey && !event.altKey) {
     unmarkAllRows();
     markedRowId = parent.ctdlRowId;
+    document.getElementById("preview_pane").innerHTML = "";
     new Ajax.Updater('preview_pane', 'msg/'+msgId, {method: 'get'});
     markRow(parent);
     new Ajax.Request('ajax_servcmd', {
diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index 60ef64dc9..328796fe5 100644
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -21,20 +21,15 @@
         <?LANG:SELECT> <br>
 </div>
         <div class="logbuttons">
-        <input type="submit" name="login_action" value="<?_("Login")>" class="logbutton">
+        <input type="submit" name="login_action" value="<?_("Login")>"   class="logbutton">
 	<??("COND:SERV:NEWU", 1)>
         <input name="newuser_action" value="<?_("New User")>" class="logbutton" type="submit">
 	<??("X", 1)>
-	<?!("COND:SERV:NEWU", 2)>
-        <div style="display:none;">
-        <input name="newuser_action" value="<?_("New User")>" class="logbutton" type="submit">
-        </div>
-	<??("X", 2)>
         <input type="submit" name="exit_action" value="<?_("Exit")>"  class="logbutton">
         <br>
         </div>
 </form>
-<??("COND:SERV:OPENID", 3)>
+<?!("COND:SERV:OPENID", 3)>
   <div id="openid" class="login_using_openid_link">
   <a href="display_openid_login">
   <img src="static/openid-small.gif" border="0" valign="middle">
@@ -47,7 +42,7 @@
 <li><?_("<b>If you are a new user</b>, enter the name and password you wish to use, and click &quot;New User.&quot; ")></li>
 <li><?_("Please log off properly when finished. ")></li>
 <li><?_("See the")> <a href="http://www.citadel.org/doku.php/faq:everydayuse:webcit_browser"><?_("recommended browser list")></a> <?_("if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> turned on. ")></li>
-<li><?_("Also keep in mind that if your browser is configured to block pop-up windows, you will not be able to receive any instant messages.")><br/></li></ul>
+<li><?_("Also keep in mind that if your browser is configured to block pop-up windows, you will not be able to receive any instant messages.")></li></ul>
  
 </div>
 </div>
diff --git a/webcit/static/t/openid_login.html b/webcit/static/t/openid_login.html
index f43bfd631..22f6cd56b 100644
--- a/webcit/static/t/openid_login.html
+++ b/webcit/static/t/openid_login.html
@@ -1,18 +1,45 @@
-<?=("beginbox")>
-<?HELLO>
-<div class="login_message"><?MESG></div>
+<?=("head")>
+<!-- start login.html -->
+<div id="login_screen">
+<div class="box">
+<div class="boxlabel"><?SERV:HUMANNODE> - <?_("powered by")> <a href="http://www.citadel.org">Citadel</a></div>
+<div class="boxcontent">
+<div id="hellomsg">
+<?SERV:MESG("hello")>
+</div>
+<?!("COND:IMPMSG", 1)>
+<div class="login_message"><?IMPORTANTMESSAGE></div>
+<?!("X", 1)>
+<div class="login_image"><img src="image?name=hello" alt=""></div>
 <form action="openid_login" method="POST"  class="box" id="login_form">
-        <label for="uname"><?OPENID_BOX></label>
-        <input type="text" name="openid_url" id="uname" class="openid_urlarea"> <br>
-        <label for="lname"><?LANGUAGE_BOX></label>
-        <?DO_LANGUAGE_BOX> <br>
+<div>
+        <label for="openid_url"><?_("OpenID URL:")></label>
+        <input type="text" name="openid_url" id="openid_url" class="openid_urlarea" > <br>
+        <label for="lname"><?_("Language:")></label>
+        <?LANG:SELECT> <br>
+</div>
         <div class="logbuttons">
-        <input type="submit" name="login_action" value="<?LOGIN_BUTTON>" class="logbutton">
-        <input type="submit" name="exit_action" value="<?EXIT_BUTTON>"  class="logbutton">
+        <input type="submit" name="login_action" value="<?_("Login")>"   class="logbutton">
+	<??("COND:SERV:NEWU", 1)>
+        <input name="newuser_action" value="<?_("New User")>" class="logbutton" type="submit">
+	<??("X", 1)>
+        <input type="submit" name="exit_action" value="<?_("Exit")>"  class="logbutton">
         <br>
         </div>
 </form>
-<?OFFER_CONVENTIONAL_LOGIN>
-<div class="login_image"><img src="image&name=hello"></div>
-<div class="login_infos"><?LOGIN_INSTRUCTIONS></div>
+<div id="convlogin">
+  <p><a href="display_login"><?_("Log in using a user name and password")></a></p>
+  </div>
+<div class="login_infos">
+<ul><li><?_("Enter your OpenID URL and click &quot;Login&quot;.")></li>
+<li><a href="http://www.citadel.org/doku.php/documentation:openid">
+<?_("Click here to learn what OpenID is and how Citadel is using it.")></a></li>
+<li><?_("Please log off properly when finished. ")></li>
+<li><?_("See the")> <a href="http://www.citadel.org/doku.php/faq:everydayuse:webcit_browser"><?_("recommended browser list")></a> <?_("if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> turned on. ")></li>
+<li><?_("Also keep in mind that if your browser is configured to block pop-up windows, you will not be able to receive any instant messages.")></li></ul>
+ 
+</div>
+</div>
+<!-- end login.html -->
 <?=("endbox")>
+<?=("trailing")>