* Added in some of the missing localizations

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 7b72951a181d6d7229ac65c49e0d5705aad391a3..e11b1c1e2c141d43aa0d590fcc7ef5ae15f86988 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,8 @@
 $Id$
 
+Mon Dec  5 11:47:20 EST 2005 ajc
+* Added in some of the missing localizations
+
 Sat Dec 3 10:28:03 CET 2005 dothebart
 * fixed langage detection to work with simple 'de' and no other stuff
 * added some translations

diff --git a/webcit/auth.c b/webcit/auth.c
index 7b1733b3b0f5900fbb4f227437296949bf3c7a97..d32818a59a431ae2512146c4a2c2ccad8cef6c9e 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -307,8 +307,9 @@ void validate(void)
        wprintf(_("Validate new users"));
        wprintf("</SPAN></TD></TR></TABLE>\n</div>\n<div id=\"content\">\n");
 
+       /* If the user just submitted a validation, process it... */
        safestrncpy(buf, bstr("user"), sizeof buf);
-       if (strlen(buf) > 0)
+       if (strlen(buf) > 0) {
                if (strlen(bstr("axlevel")) > 0) {
                        serv_printf("VALI %s|%s", buf, bstr("axlevel"));
                        serv_getln(buf, sizeof buf);
@@ -316,9 +317,18 @@ void validate(void)
                                wprintf("<b>%s</b><br />\n", &buf[4]);
                        }
                }
+       }
+
+       /* Now see if any more users require validation. */
        serv_puts("GNUR");
        serv_getln(buf, sizeof buf);
-
+       if (buf[0] == '2') {
+               wprintf("<b>");
+               wprintf(_("No users require validation at this time."));
+               wprintf("</b><br />\n");
+               wDumpContent(1);
+               return;
+       }
        if (buf[0] != '3') {
                wprintf("<b>%s</b><br />\n", &buf[4]);
                wDumpContent(1);
@@ -338,7 +348,7 @@ void validate(void)
                        serv_getln(buf, sizeof buf);
                        ++a;
                        if (a == 1)
-                               wprintf("User #%s<br /><H1>%s</H1>",
+                               wprintf("#%s<br /><H1>%s</H1>",
                                        buf, &cmd[4]);
                        if (a == 2)
                                wprintf("PW: %s<br />\n", buf);

diff --git a/webcit/messages.c b/webcit/messages.c
index e5d2a93b25a21d1bbfc891e836a08b6fef31e03f..6fb26541e9c73e2e7a2f3f1e78b21a5dd6ecd16a 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -2664,7 +2664,9 @@ void display_enter(void)
 
        /* Enumerate any attachments which are already in place... */
        wprintf("<img src=\"static/diskette_24x.gif\" border=0 "
-               "align=middle height=16 width=16> Attachments: ");
+               "align=middle height=16 width=16> ");
+       wprintf(_("Attachments:"));
+       wprintf(" ");
        wprintf("<select name=\"which_attachment\" size=1>");
        for (att = WC->first_attachment; att != NULL; att = att->next) {
                wprintf("<option value=\"");
@@ -2677,8 +2679,9 @@ void display_enter(void)
        wprintf("</select>");
 
        /* Now offer the ability to attach additional files... */
-       wprintf("&nbsp;&nbsp;&nbsp;"
-               "Attach file: <input NAME=\"attachfile\" "
+       wprintf("&nbsp;&nbsp;&nbsp;");
+       wprintf(_("Attach file:"));
+       wprintf(" <input NAME=\"attachfile\" "
                "SIZE=16 TYPE=\"file\">\n&nbsp;&nbsp;"
                "<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
 

diff --git a/webcit/po/de.po b/webcit/po/de.po
index 0db6acec36ad2cfdda3b5a8f671f268c24a63c23..afee5c3f6291075c7b1dc2e42b0184bd24a24bc2 100644 (file)
--- 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: 2005-12-03 23:01-0500\n"
+"POT-Creation-Date: 2005-12-05 11:46-0500\n"
 "PO-Revision-Date: 2005-12-04 14:41+0100\n"
 "Last-Translator: Wilfried Goesgens <w.goesgens@chaosindustries.de>\n"
 "Language-Team: German <citadel-dev@uncensored.citadel.org>\n"
@@ -95,7 +95,7 @@ msgstr "Ende"
 msgid "%s - powered by Citadel"
 msgstr "%s - mit Citadel-Technologie"
 
-#: ../auth.c:157 ../auth.c:503
+#: ../auth.c:157 ../auth.c:513
 msgid "Blank passwords are not allowed."
 msgstr "Leere Passwörter sind nicht zulässig."
 
@@ -119,45 +119,49 @@ msgstr "Fenster Schließen"
 msgid "Validate new users"
 msgstr "Neue Benutzer überprüfen"
 
-#: ../auth.c:358
+#: ../auth.c:327
+msgid "No users require validation at this time."
+msgstr ""
+
+#: ../auth.c:368
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Aktuelle Berechtigungen: %d (%s)\n"
 
-#: ../auth.c:366
+#: ../auth.c:376
 msgid "Select access level for this user:"
 msgstr "Berechtigungen dieses Benutzers"
 
-#: ../auth.c:428 ../mainmenu.c:135
+#: ../auth.c:438 ../mainmenu.c:135
 msgid "Change your password"
 msgstr "Ändern Sie Ihr Passwort"
 
-#: ../auth.c:457
+#: ../auth.c:467
 msgid "Enter new password:"
 msgstr "Bitte geben Sie ein neues Passwort ein"
 
-#: ../auth.c:461
+#: ../auth.c:471
 msgid "Enter it again to confirm:"
 msgstr "Nocheinmal zur Verifizierung:"
 
-#: ../auth.c:466
+#: ../auth.c:476
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: ../auth.c:468 ../calendar.c:582 ../event.c:385 ../graphics.c:57
-#: ../iconbar.c:699 ../mainmenu.c:298 ../messages.c:2590 ../messages.c:2693
-#: ../messages.c:2777 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
-#: ../preferences.c:361 ../roomops.c:1162 ../roomops.c:1489 ../roomops.c:1917
-#: ../roomops.c:2066 ../roomops.c:2130 ../siteconfig.c:821 ../sysmsgs.c:52
+#: ../auth.c:478 ../calendar.c:582 ../event.c:385 ../graphics.c:57
+#: ../iconbar.c:699 ../mainmenu.c:298 ../messages.c:2590 ../messages.c:2696
+#: ../messages.c:2780 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
+#: ../preferences.c:361 ../roomops.c:1164 ../roomops.c:1492 ../roomops.c:1921
+#: ../roomops.c:2070 ../roomops.c:2134 ../siteconfig.c:821 ../sysmsgs.c:52
 #: ../useredit.c:366 ../vcard_edit.c:330 ../who.c:268
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../auth.c:484
+#: ../auth.c:494
 msgid "Cancelled.  Password was not changed."
 msgstr "Abgebrochen. Passwort wurde nicht gesetzt."
 
-#: ../auth.c:495
+#: ../auth.c:505
 msgid "They don't match.  Password was not changed."
 msgstr "Die Passwörter stimmen nicht überein. Passwort nicht geändert"
 
@@ -307,7 +311,8 @@ msgstr "Auf Anfrage zum Treffen antworten"
 msgid ""
 "You have accepted this meeting invitation.  It has been entered into your "
 "calendar."
-msgstr "Sie haben die Einladung angenommen.  Sie wurde in Ihren Kalender übernommen."
+msgstr ""
+"Sie haben die Einladung angenommen.  Sie wurde in Ihren Kalender übernommen."
 
 #: ../calendar.c:359
 msgid ""
@@ -668,7 +673,7 @@ msgstr "Erweitert"
 msgid "Room and system administration functions"
 msgstr "Räume und Verwaltung"
 
-#: ../iconbar.c:291 ../roomops.c:879
+#: ../iconbar.c:291 ../roomops.c:881
 msgid "Administration"
 msgstr "Verwaltung"
 
@@ -786,7 +791,7 @@ msgstr "Citadel Logo"
 msgid "Displays the 'Powered by Citadel' icon"
 msgstr "Den Citadel-Brand anzeigen"
 
-#: ../iconbar.c:698 ../netconf.c:136 ../roomops.c:1161 ../roomops.c:1487
+#: ../iconbar.c:698 ../netconf.c:136 ../roomops.c:1163 ../roomops.c:1490
 #: ../siteconfig.c:819 ../sysmsgs.c:50 ../useredit.c:366 ../vcard_edit.c:329
 msgid "Save changes"
 msgstr "Änderungen übernehmen"
@@ -859,7 +864,8 @@ msgstr "(Domänen, deren Unterdomänen diese Citadel-Maschinen treffen)"
 
 #: ../inetconf.c:52
 msgid "(if present, forward all outbound mail to one of these hosts)"
-msgstr "(wenn gesetzt, alle zu versendende Mail über diese Maschine verschicken)"
+msgstr ""
+"(wenn gesetzt, alle zu versendende Mail über diese Maschine verschicken)"
 
 #: ../inetconf.c:53
 msgid "(hosts running a Realtime Blackhole List)"
@@ -929,7 +935,7 @@ msgstr "Bekannte Räume aufzählen"
 msgid "Where can I go from here?"
 msgstr "Wo komme ich von hier aus hin?"
 
-#: ../mainmenu.c:37 ../roomops.c:535
+#: ../mainmenu.c:37 ../roomops.c:537
 msgid "Goto next room"
 msgstr "Zum nächsten Raum"
 
@@ -945,7 +951,7 @@ msgstr "Weiter zum nächsten Raum"
 msgid "(come back here later)"
 msgstr "(später zurückkehren)"
 
-#: ../mainmenu.c:55 ../roomops.c:373
+#: ../mainmenu.c:55 ../roomops.c:375
 msgid "Ungoto"
 msgstr "Zurück"
 
@@ -954,7 +960,7 @@ msgstr "Zurück"
 msgid "(oops! Back to %s)"
 msgstr "(Hoppla! Zurück zu %s)"
 
-#: ../mainmenu.c:66 ../roomops.c:382
+#: ../mainmenu.c:66 ../roomops.c:384
 msgid "Read new messages"
 msgstr "Neue Beiträge"
 
@@ -962,7 +968,7 @@ msgstr "Neue Beiträge"
 msgid "...in this room"
 msgstr "... in diesem Raum"
 
-#: ../mainmenu.c:74 ../roomops.c:460
+#: ../mainmenu.c:74 ../roomops.c:462
 msgid "Read all messages"
 msgstr "Alle Beiträge"
 
@@ -970,7 +976,7 @@ msgstr "Alle Beiträge"
 msgid "...old <EM>and</EM> new"
 msgstr "... alte <EM>und</EM> neue"
 
-#: ../mainmenu.c:82 ../roomops.c:510
+#: ../mainmenu.c:82 ../roomops.c:512
 msgid "Enter a message"
 msgstr "Beitrag verfassen"
 
@@ -1026,7 +1032,7 @@ msgstr "Diesen Raum bearbeiten oder Löschen"
 msgid "Go to a 'hidden' room"
 msgstr "In einen 'versteckten' Raum gehen"
 
-#: ../mainmenu.c:169 ../roomops.c:1817
+#: ../mainmenu.c:169 ../roomops.c:1821
 msgid "Create a new room"
 msgstr "Einen neuen Raum erzeugen"
 
@@ -1174,7 +1180,7 @@ msgstr "AntwortenAnAlle"
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ../messages.c:806 ../messages.c:2775
+#: ../messages.c:806 ../messages.c:2778
 msgid "Move"
 msgstr "Verschieben"
 
@@ -1248,7 +1254,8 @@ msgstr "Abgebrochen. Beitrag wurde nicht eingereicht."
 #: ../messages.c:2384
 #, c-format
 msgid "Automatically cancelled because you have already saved this message."
-msgstr "Automatisch abgebrochen, weil Sie diesen Beitrag schon gespeichert haben."
+msgstr ""
+"Automatisch abgebrochen, weil Sie diesen Beitrag schon gespeichert haben."
 
 #: ../messages.c:2401
 #, c-format
@@ -1280,11 +1287,11 @@ msgstr "BCC:"
 msgid "Subject (optional):"
 msgstr "Betreff (optional):"
 
-#: ../messages.c:2585 ../messages.c:2688 ../paging.c:55
+#: ../messages.c:2585 ../messages.c:2691 ../paging.c:55
 msgid "Send message"
 msgstr "Meldung senden"
 
-#: ../messages.c:2587 ../messages.c:2690
+#: ../messages.c:2587 ../messages.c:2693
 msgid "Post message"
 msgstr "Beitrag einreichen"
 
@@ -1292,19 +1299,27 @@ msgstr "Beitrag einreichen"
 msgid "--- forwarded message ---"
 msgstr "--- Weitergeleitete Nachricht ---"
 
-#: ../messages.c:2683 ../roomops.c:1354 ../roomops.c:1384
+#: ../messages.c:2668
+msgid "Attachments:"
+msgstr ""
+
+#: ../messages.c:2683
+msgid "Attach file:"
+msgstr ""
+
+#: ../messages.c:2686 ../roomops.c:1356 ../roomops.c:1386
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../messages.c:2748
+#: ../messages.c:2751
 msgid "Confirm move of message"
 msgstr "Verschieben bestätigen"
 
-#: ../messages.c:2755
+#: ../messages.c:2758
 msgid "Move this message to:"
 msgstr "Meldung verschieben nach:"
 
-#: ../messages.c:2799
+#: ../messages.c:2802
 #, c-format
 msgid "The message was not moved."
 msgstr "Die Meldung wurde nicht verschoben."
@@ -1502,219 +1517,225 @@ msgstr "Raum Vergessen"
 msgid "Click on any room to un-zap it and goto that room.\n"
 msgstr "Auf einen beliebigen vergessenen Raum klicken um ihn zu betreten\n"
 
-#: ../roomops.c:396
+#: ../roomops.c:299
+#, fuzzy
+msgid "View as:"
+msgstr "Aufgaben anzeigen"
+
+#: ../roomops.c:398
 msgid "View contacts"
 msgstr "Kontakte Anzeigen"
 
-#: ../roomops.c:407
+#: ../roomops.c:409
 msgid "Day view"
 msgstr "Tages Übersicht"
 
-#: ../roomops.c:416
+#: ../roomops.c:418
 msgid "Month view"
 msgstr "Monats Übersicht"
 
-#: ../roomops.c:427
+#: ../roomops.c:429
 msgid "View tasks"
 msgstr "Aufgaben anzeigen"
 
-#: ../roomops.c:438
+#: ../roomops.c:440
 msgid "View notes"
 msgstr "Nachrichten anzeigen"
 
-#: ../roomops.c:449
+#: ../roomops.c:451
 msgid "View message list"
 msgstr "Nachrichtenliste anzeigen"
 
-#: ../roomops.c:474
+#: ../roomops.c:476
 msgid "Add new contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: ../roomops.c:483
+#: ../roomops.c:485
 msgid "Add new event"
 msgstr "Neuen Termin hinzufügen"
 
-#: ../roomops.c:492
+#: ../roomops.c:494
 msgid "Add new task"
 msgstr "Neue Aufgabe"
 
-#: ../roomops.c:501
+#: ../roomops.c:503
 msgid "Add new note"
 msgstr "Neue Notiz"
 
-#: ../roomops.c:523
-msgid "Leave all messages marked as unread, go to next room with unread messages"
+#: ../roomops.c:525
+msgid ""
+"Leave all messages marked as unread, go to next room with unread messages"
 msgstr ""
 "Alle Beiträge ungelesen lassen, und in den nächsten Raum mit ungelesenen "
 "Nachrichten gehen"
 
-#: ../roomops.c:524
+#: ../roomops.c:526
 msgid "Skip this room"
 msgstr "Raum Überspringen"
 
-#: ../roomops.c:534
+#: ../roomops.c:536
 msgid "Mark all messages as read, go to next room with unread messages"
 msgstr ""
 "Alle Nachrichten als ungelesen markieren, und in den nächsten Raum mit "
 "ungelesenen Nachrichten gehen"
 
-#: ../roomops.c:895
+#: ../roomops.c:897
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: ../roomops.c:911
+#: ../roomops.c:913
 msgid "Message expire policy"
 msgstr "Nachrichten Gültigkeitsvorgabe"
 
-#: ../roomops.c:927
+#: ../roomops.c:929
 msgid "Access controls"
 msgstr "Zugangs-Kontrolle"
 
-#: ../roomops.c:943
+#: ../roomops.c:945
 msgid "Sharing"
 msgstr "Teilen"
 
-#: ../roomops.c:959
+#: ../roomops.c:961
 msgid "Mailing list service"
 msgstr "Mailinglisten Service"
 
-#: ../roomops.c:981
+#: ../roomops.c:983
 msgid "Are you sure you want to delete this room?"
 msgstr "Sind Sie sicher, das Sie diesen Raum löschen wollen?"
 
-#: ../roomops.c:983
+#: ../roomops.c:985
 msgid "Delete this room"
 msgstr "Raum Löschen"
 
-#: ../roomops.c:986
+#: ../roomops.c:988
 msgid "Set or change the icon for this room's banner"
 msgstr "Das Bannersymbol des Raums ändern"
 
-#: ../roomops.c:989
+#: ../roomops.c:991
 msgid "Edit this room's Info file"
 msgstr "Die Infodatei dieses Raums ändern"
 
-#: ../roomops.c:998 ../roomops.c:1829
+#: ../roomops.c:1000 ../roomops.c:1833
 msgid "Name of room: "
 msgstr "Name des Raums: "
 
-#: ../roomops.c:1005 ../roomops.c:1833
+#: ../roomops.c:1007 ../roomops.c:1837
 msgid "Resides on floor: "
 msgstr "Ist in der Etage: "
 
-#: ../roomops.c:1019 ../roomops.c:1871
+#: ../roomops.c:1021 ../roomops.c:1875
 msgid "Type of room:"
 msgstr "Raum-Typ:"
 
-#: ../roomops.c:1026
+#: ../roomops.c:1028
 msgid "Public room"
 msgstr "Öffentlicher Raum"
 
-#: ../roomops.c:1034
+#: ../roomops.c:1036
 msgid "Private - guess name"
 msgstr "Privat - Namen raten"
 
-#: ../roomops.c:1041
+#: ../roomops.c:1043
 msgid "Private - require password:"
 msgstr "Privat - Passwort nötig"
 
-#: ../roomops.c:1051 ../roomops.c:1902
+#: ../roomops.c:1053 ../roomops.c:1906
 msgid "Private - invitation only"
 msgstr "Privat - nur mit Einladung"
 
-#: ../roomops.c:1055
+#: ../roomops.c:1057
 msgid "If private, cause current users to forget room"
 msgstr "Wenn Privat, sollen aktuelle Benutzer den Raum Vergessen?"
 
-#: ../roomops.c:1063
+#: ../roomops.c:1065
 msgid "Preferred users only"
 msgstr "nur Privilegierte Benutzer"
 
-#: ../roomops.c:1069
+#: ../roomops.c:1071
 msgid "Read-only room"
 msgstr "Nicht Schreibbarer Raum"
 
-#: ../roomops.c:1076
+#: ../roomops.c:1078
 msgid "File directory room"
 msgstr "Dateiverzeichnis Raum"
 
-#: ../roomops.c:1079
+#: ../roomops.c:1081
 msgid "Directory name: "
 msgstr "Verzeichnisname:  "
 
-#: ../roomops.c:1087
+#: ../roomops.c:1089
 msgid "Uploading allowed"
 msgstr "Hochladen erlaubt"
 
-#: ../roomops.c:1093
+#: ../roomops.c:1095
 msgid "Downloading allowed"
 msgstr "Herunterladen erlaubt"
 
-#: ../roomops.c:1099
+#: ../roomops.c:1101
 msgid "Visible directory"
 msgstr "Sichtbares Verzeichnis"
 
-#: ../roomops.c:1108
+#: ../roomops.c:1110
 msgid "Network shared room"
 msgstr "Netzwerk öffentlicher Raum"
 
-#: ../roomops.c:1114
+#: ../roomops.c:1116
 msgid "Permanent (does not auto-purge)"
 msgstr "Permanent (kein automatisches Löschen"
 
-#: ../roomops.c:1119
+#: ../roomops.c:1121
 msgid "Anonymous messages"
 msgstr "Anonyme Nachrichten"
 
-#: ../roomops.c:1127
+#: ../roomops.c:1129
 msgid "No anonymous messages"
 msgstr "Keine anonyme Nachrichten"
 
-#: ../roomops.c:1133
+#: ../roomops.c:1135
 msgid "All messages are anonymous"
 msgstr "Alle Nachrichten sind Anonym"
 
-#: ../roomops.c:1139
+#: ../roomops.c:1141
 msgid "Prompt user when entering messages"
 msgstr "Benutzer fragen, wenn er die Nachricht eingibt"
 
-#: ../roomops.c:1145
+#: ../roomops.c:1147
 msgid "Room aide: "
 msgstr "Raumverantwortlicher: "
 
-#: ../roomops.c:1217
+#: ../roomops.c:1219
 msgid "Shared with"
 msgstr "Geteilt mit"
 
-#: ../roomops.c:1220
+#: ../roomops.c:1222
 msgid "Not shared with"
 msgstr "Nicht geteilt mit"
 
-#: ../roomops.c:1225 ../roomops.c:1270
+#: ../roomops.c:1227 ../roomops.c:1272
 msgid "Remote node name"
 msgstr "Entfernter Knotenname"
 
-#: ../roomops.c:1227 ../roomops.c:1272
+#: ../roomops.c:1229 ../roomops.c:1274
 msgid "Remote room name"
 msgstr "Entfernter Raumname"
 
-#: ../roomops.c:1229 ../roomops.c:1274
+#: ../roomops.c:1231 ../roomops.c:1276
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../roomops.c:1262
+#: ../roomops.c:1264
 msgid "Unshare"
 msgstr "Freigabe Wiederrufen"
 
-#: ../roomops.c:1299
+#: ../roomops.c:1301
 msgid "Share"
 msgstr "Freigabe"
 
-#: ../roomops.c:1307
+#: ../roomops.c:1309
 msgid "Notes:"
 msgstr "Notizen:"
 
-#: ../roomops.c:1308
+#: ../roomops.c:1310
 msgid ""
 "When sharing a room, it must be shared from both ends.  Adding a node to the "
 "'shared' list sends messages out, but in order to receive messages, the "
@@ -1730,7 +1751,7 @@ msgstr ""
 "Knoten einen anderen Namen für den Raum verwendet, muss er den hiesigen "
 "Raumnamen hier auch konfigurieren..</UL></I><br />\n"
 
-#: ../roomops.c:1329
+#: ../roomops.c:1331
 msgid ""
 "<i>The contents of this room are being mailed <b>as individual messages</b> "
 "to the following list recipients:</i><br /><br />\n"
@@ -1738,11 +1759,11 @@ msgstr ""
 "<i>Der Inhalt dieses Raums wird per Email als <b>einzelne Nachricht</b> an "
 "die Folgenden Empfänger versendet:</i><br /><br />\n"
 
-#: ../roomops.c:1346 ../roomops.c:1376
+#: ../roomops.c:1348 ../roomops.c:1378
 msgid "(remove)"
 msgstr "(Löschen)"
 
-#: ../roomops.c:1359
+#: ../roomops.c:1361
 msgid ""
 "<i>The contents of this room are being mailed <b>in digest form</b> to the "
 "following list recipients:</i><br /><br />\n"
@@ -1750,79 +1771,81 @@ msgstr ""
 "<i> Der Inhalt dieses Raums wird als <b>Tageszusammenfassung</b> an die "
 "folgende Liste versendet:</i><br /><br />\n"
 
-#: ../roomops.c:1390
-msgid "This room is configured to allow self-service subscribe/unsubscribe requests."
+#: ../roomops.c:1392
+msgid ""
+"This room is configured to allow self-service subscribe/unsubscribe requests."
 msgstr "Dieser Raum erlaubt Benutzergesteuertes Abonnieren."
 
-#: ../roomops.c:1393
+#: ../roomops.c:1395
 msgid "Click to disable."
 msgstr "Klicken zum Abschalten"
 
-#: ../roomops.c:1395
+#: ../roomops.c:1397
 msgid "The URL for subscribe/unsubscribe is: "
 msgstr "Die URL zum Ab/Bestellen ist: "
 
-#: ../roomops.c:1401
+#: ../roomops.c:1403
 msgid ""
 "This room is <i>not</i> configured to allow self-service subscribe/"
 "unsubscribe requests."
-msgstr "Dieser Raum ist <i>nicht</> für Benutzergesteuertes Abonieren freigegeben"
+msgstr ""
+"Dieser Raum ist <i>nicht</> für Benutzergesteuertes Abonieren freigegeben"
 
-#: ../roomops.c:1405
+#: ../roomops.c:1407
 msgid "Click to enable."
 msgstr "Klicken zum Anschalten"
 
-#: ../roomops.c:1434
+#: ../roomops.c:1436
 msgid "Message expire policy for this room"
 msgstr "Nachrichten Verfallsvorgabe für diesen Raum"
 
-#: ../roomops.c:1440
+#: ../roomops.c:1442
 msgid "Use the default policy for this floor"
 msgstr "Die Vorgaberichtlinie dieser Etage verwenden "
 
-#: ../roomops.c:1444 ../roomops.c:1470 ../siteconfig.c:769 ../siteconfig.c:794
+#: ../roomops.c:1446 ../roomops.c:1473 ../siteconfig.c:769 ../siteconfig.c:794
 msgid "Never automatically expire messages"
 msgstr "Nachrichten nie automatisch löschen"
 
-#: ../roomops.c:1451 ../roomops.c:1478 ../siteconfig.c:777 ../siteconfig.c:802
+#: ../roomops.c:1450 ../roomops.c:1477 ../siteconfig.c:773 ../siteconfig.c:798
+msgid "Expire by message count"
+msgstr "Nachrichten nach Anzahl löschen"
+
+#: ../roomops.c:1454 ../roomops.c:1481 ../siteconfig.c:777 ../siteconfig.c:802
 msgid "Expire by message age"
 msgstr "Lösche Nachrichten älter als"
 
-#: ../roomops.c:1453 ../roomops.c:1480 ../siteconfig.c:779 ../siteconfig.c:804
+#: ../roomops.c:1456 ../roomops.c:1483 ../siteconfig.c:779 ../siteconfig.c:804
 msgid "Number of messages or days: "
 msgstr "Anzahl der Nachrichten pro Tag: "
 
-#: ../roomops.c:1460
+#: ../roomops.c:1463
 msgid "Message expire policy for this floor"
 msgstr "Nachrichten Verfallsvorgabe für diese Etage"
 
-#: ../roomops.c:1466
+#: ../roomops.c:1469
 msgid "Use the system default"
 msgstr "Die Systemvorgabe benutzen"
 
-#: ../roomops.c:1474 ../siteconfig.c:773 ../siteconfig.c:798
-msgid "Expire by message count"
-msgstr "Nachrichten nach Anzahl löschen"
-
-#: ../roomops.c:1541 ../roomops.c:2880
+#: ../roomops.c:1544 ../roomops.c:2884
 msgid "Cancelled.  Changes were not saved."
 msgstr "Abgebrochen. Änderungen wurden nicht übernommen."
 
-#: ../roomops.c:1680
+#: ../roomops.c:1683
 msgid "Your changes have been saved."
 msgstr "Ihre Änderungen wurden gespeichert"
 
-#: ../roomops.c:1712
+#: ../roomops.c:1715
 #, c-format
 msgid "<B><I>User %s kicked out of room %s.</I></B>\n"
 msgstr "<B><I>Benutzer %s des Raums %s verbannt</I></B>\n"
 
-#: ../roomops.c:1726
+#: ../roomops.c:1729
 #, c-format
 msgid "<B><I>User %s invited to room %s.</I></B>\n"
 msgstr "<B><I>Benutzer %s in den Raum %s eingeladen.</I></B>\n"
 
-#: ../roomops.c:1754
+#: ../roomops.c:1757
 msgid ""
 "The users listed below have access to this room.  To remove a user from the "
 "access list, select the user name from the list and click 'Kick'."
@@ -1830,11 +1853,11 @@ msgstr ""
 "Die folgenden Benutzer haben Zugang zu diesem Raum.  Um einen Benutzer von "
 "der Zugriffsliste zu löschen, ihn in der Liste anwählen und 'Bannen' drücken"
 
-#: ../roomops.c:1774
+#: ../roomops.c:1777
 msgid "Kick"
 msgstr "Bannen"
 
-#: ../roomops.c:1778
+#: ../roomops.c:1781
 msgid ""
 "To grant another user access to this room, enter the user name in the box "
 "below and click 'Invite'."
@@ -1842,43 +1865,48 @@ msgstr ""
 "Um einem weiteren Benutzer den Zugang zu diesem Raum zu erlauben den "
 "Benutzernamen in das folgende Textfeld eintragen und 'Einladen' drücken"
 
-#: ../roomops.c:1788
+#: ../roomops.c:1787
+#, fuzzy
+msgid "Invite:"
+msgstr "Einladen"
+
+#: ../roomops.c:1792
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../roomops.c:1851
+#: ../roomops.c:1855
 msgid "Default view for room: "
 msgstr "Vorgabe Ansicht für diesen Raum: "
 
-#: ../roomops.c:1880
+#: ../roomops.c:1884
 msgid "Public (automatically appears to everyone)"
 msgstr "Öffentlich (Raum zugänglich für jeden)"
 
-#: ../roomops.c:1887
+#: ../roomops.c:1891
 msgid "Private - hidden (accessible to anyone who knows its name)"
 msgstr "Privat - versteckt (zugänglich für jeden der den Namen weiß)"
 
-#: ../roomops.c:1894
+#: ../roomops.c:1898
 msgid "Private - require password: "
 msgstr "Privat - erfordert Passwort: "
 
-#: ../roomops.c:1910
+#: ../roomops.c:1914
 msgid "Personal (mailbox for you only)"
 msgstr "Persönlich (Briefkasten, nur für Sie)"
 
-#: ../roomops.c:1915
+#: ../roomops.c:1919
 msgid "Create new room"
 msgstr "Neuer Raum"
 
-#: ../roomops.c:1983
+#: ../roomops.c:1987
 msgid "Cancelled.  No new room was created."
 msgstr "Abgebrochen. Keinen neuen Raum erzeugt."
 
-#: ../roomops.c:2026
+#: ../roomops.c:2030
 msgid "Go to a hidden room"
 msgstr "Zu einem versteckten Raum gehen"
 
-#: ../roomops.c:2037
+#: ../roomops.c:2041
 msgid ""
 "If you know the name of a hidden (guess-name) or passworded room, you can "
 "enter that room by typing its name below.  Once you gain access to a private "
@@ -1889,23 +1917,23 @@ msgstr ""
 "Raums wissen, Hier eingeben um ihn zu betreten.  Wenn er einmal sichtbar "
 "ist, wird er mit den regulären Räumen gelistet."
 
-#: ../roomops.c:2049
+#: ../roomops.c:2053
 msgid "Enter room name:"
 msgstr "Raumname eingeben:"
 
-#: ../roomops.c:2056
+#: ../roomops.c:2060
 msgid "Enter room password:"
 msgstr "Raumpasswort eingeben:"
 
-#: ../roomops.c:2065
+#: ../roomops.c:2069
 msgid "Go there"
 msgstr "Betreten"
 
-#: ../roomops.c:2118
+#: ../roomops.c:2122
 msgid "Zap (forget/unsubscribe) the current room"
 msgstr "den aktuellen Raum vergessen (vergessen/abmelden)"
 
-#: ../roomops.c:2123
+#: ../roomops.c:2127
 #, c-format
 msgid ""
 "If you select this option, <em>%s</em> will disappear from your room list.  "
@@ -1914,7 +1942,7 @@ msgstr ""
 "Wenn Sie diese Option wählen, wird <em>%s</em>aus der Raumliste "
 "verschwinden.   Wollen Sie das wirklich tun?<br />\n"
 
-#: ../roomops.c:2128
+#: ../roomops.c:2132
 msgid "Zap this room"
 msgstr "Raum vergessen"
 
@@ -1986,7 +2014,8 @@ msgstr "Automatischer Verfall alter Nachrichten konfigurieren"
 msgid ""
 "Changes made on this screen will not take effect until you restart the "
 "Citadel server."
-msgstr "Änderungen in diesem Menü werden erst mit Neustart des Citadel-Servers aktiv"
+msgstr ""
+"Änderungen in diesem Menü werden erst mit Neustart des Citadel-Servers aktiv"
 
 #: ../siteconfig.c:155
 msgid "Citadel LDAP connector configuration"
@@ -2014,7 +2043,8 @@ msgstr "Telefonnummer"
 
 #: ../siteconfig.c:241
 msgid "Automatically grant room-aide status to users who create private rooms"
-msgstr "Automatisch dem Raumerzeuger administrative Rechte an dem neuen Raum geben"
+msgstr ""
+"Automatisch dem Raumerzeuger administrative Rechte an dem neuen Raum geben"
 
 #: ../siteconfig.c:254
 msgid "Server connection idle timeout (in seconds)"
@@ -2170,11 +2200,13 @@ msgstr "Mail Relaying anschalten (nicht empfohlen bei öffentlichen Servern)"
 
 #: ../siteconfig.c:765
 msgid "Default message expire policy for public rooms"
-msgstr "Vorgabewerte für die Gültigkeitsdauer von Nachrichten in öffentlichen Räumen"
+msgstr ""
+"Vorgabewerte für die Gültigkeitsdauer von Nachrichten in öffentlichen Räumen"
 
 #: ../siteconfig.c:786
 msgid "Default message expire policy for private mailboxes"
-msgstr "Vorgabewerte für die Gültigkeitsdauer von Nachrichten in privaten Mailboxen"
+msgstr ""
+"Vorgabewerte für die Gültigkeitsdauer von Nachrichten in privaten Mailboxen"
 
 #: ../siteconfig.c:790
 msgid "Same policy as public rooms"
@@ -2391,7 +2423,8 @@ msgid "Delete this user?"
 msgstr "Diesen Benutzer löschen?"
 
 #: ../useredit.c:192
-msgid "An error occurred while trying to create or edit this address book entry."
+msgid ""
+"An error occurred while trying to create or edit this address book entry."
 msgstr "Fehler beim Erzeugen / Editieren dieses Adressbuch-Eintrags"
 
 #: ../useredit.c:268
@@ -2668,4 +2701,3 @@ msgstr "Rechnername setzen"
 #: ../who.c:263
 msgid "Change user name"
 msgstr "Benutzername ändern"
-

diff --git a/webcit/po/webcit.pot b/webcit/po/webcit.pot
index 384cae3b77a60e6d914198da91de6bca4d0c9e69..2188f77d9b3048d7e04233a2702eaff89e51e38c 100644 (file)
--- 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: 2005-12-03 23:01-0500\n"
+"POT-Creation-Date: 2005-12-05 11:46-0500\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"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "%s - powered by Citadel"
 msgstr ""
 
-#: ../auth.c:157 ../auth.c:503
+#: ../auth.c:157 ../auth.c:513
 msgid "Blank passwords are not allowed."
 msgstr ""
 
@@ -103,45 +103,49 @@ msgstr ""
 msgid "Validate new users"
 msgstr ""
 
-#: ../auth.c:358
+#: ../auth.c:327
+msgid "No users require validation at this time."
+msgstr ""
+
+#: ../auth.c:368
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr ""
 
-#: ../auth.c:366
+#: ../auth.c:376
 msgid "Select access level for this user:"
 msgstr ""
 
-#: ../auth.c:428 ../mainmenu.c:135
+#: ../auth.c:438 ../mainmenu.c:135
 msgid "Change your password"
 msgstr ""
 
-#: ../auth.c:457
+#: ../auth.c:467
 msgid "Enter new password:"
 msgstr ""
 
-#: ../auth.c:461
+#: ../auth.c:471
 msgid "Enter it again to confirm:"
 msgstr ""
 
-#: ../auth.c:466
+#: ../auth.c:476
 msgid "Change password"
 msgstr ""
 
-#: ../auth.c:468 ../calendar.c:582 ../event.c:385 ../graphics.c:57
-#: ../iconbar.c:699 ../mainmenu.c:298 ../messages.c:2590 ../messages.c:2693
-#: ../messages.c:2777 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
-#: ../preferences.c:361 ../roomops.c:1162 ../roomops.c:1489 ../roomops.c:1917
-#: ../roomops.c:2066 ../roomops.c:2130 ../siteconfig.c:821 ../sysmsgs.c:52
+#: ../auth.c:478 ../calendar.c:582 ../event.c:385 ../graphics.c:57
+#: ../iconbar.c:699 ../mainmenu.c:298 ../messages.c:2590 ../messages.c:2696
+#: ../messages.c:2780 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
+#: ../preferences.c:361 ../roomops.c:1164 ../roomops.c:1492 ../roomops.c:1921
+#: ../roomops.c:2070 ../roomops.c:2134 ../siteconfig.c:821 ../sysmsgs.c:52
 #: ../useredit.c:366 ../vcard_edit.c:330 ../who.c:268
 msgid "Cancel"
 msgstr ""
 
-#: ../auth.c:484
+#: ../auth.c:494
 msgid "Cancelled.  Password was not changed."
 msgstr ""
 
-#: ../auth.c:495
+#: ../auth.c:505
 msgid "They don't match.  Password was not changed."
 msgstr ""
 
@@ -630,7 +634,7 @@ msgstr ""
 msgid "Room and system administration functions"
 msgstr ""
 
-#: ../iconbar.c:291 ../roomops.c:879
+#: ../iconbar.c:291 ../roomops.c:881
 msgid "Administration"
 msgstr ""
 
@@ -745,7 +749,7 @@ msgstr ""
 msgid "Displays the 'Powered by Citadel' icon"
 msgstr ""
 
-#: ../iconbar.c:698 ../netconf.c:136 ../roomops.c:1161 ../roomops.c:1487
+#: ../iconbar.c:698 ../netconf.c:136 ../roomops.c:1163 ../roomops.c:1490
 #: ../siteconfig.c:819 ../sysmsgs.c:50 ../useredit.c:366 ../vcard_edit.c:329
 msgid "Save changes"
 msgstr ""
@@ -884,7 +888,7 @@ msgstr ""
 msgid "Where can I go from here?"
 msgstr ""
 
-#: ../mainmenu.c:37 ../roomops.c:535
+#: ../mainmenu.c:37 ../roomops.c:537
 msgid "Goto next room"
 msgstr ""
 
@@ -900,7 +904,7 @@ msgstr ""
 msgid "(come back here later)"
 msgstr ""
 
-#: ../mainmenu.c:55 ../roomops.c:373
+#: ../mainmenu.c:55 ../roomops.c:375
 msgid "Ungoto"
 msgstr ""
 
@@ -909,7 +913,7 @@ msgstr ""
 msgid "(oops! Back to %s)"
 msgstr ""
 
-#: ../mainmenu.c:66 ../roomops.c:382
+#: ../mainmenu.c:66 ../roomops.c:384
 msgid "Read new messages"
 msgstr ""
 
@@ -917,7 +921,7 @@ msgstr ""
 msgid "...in this room"
 msgstr ""
 
-#: ../mainmenu.c:74 ../roomops.c:460
+#: ../mainmenu.c:74 ../roomops.c:462
 msgid "Read all messages"
 msgstr ""
 
@@ -925,7 +929,7 @@ msgstr ""
 msgid "...old <EM>and</EM> new"
 msgstr ""
 
-#: ../mainmenu.c:82 ../roomops.c:510
+#: ../mainmenu.c:82 ../roomops.c:512
 msgid "Enter a message"
 msgstr ""
 
@@ -981,7 +985,7 @@ msgstr ""
 msgid "Go to a 'hidden' room"
 msgstr ""
 
-#: ../mainmenu.c:169 ../roomops.c:1817
+#: ../mainmenu.c:169 ../roomops.c:1821
 msgid "Create a new room"
 msgstr ""
 
@@ -1126,7 +1130,7 @@ msgstr ""
 msgid "Forward"
 msgstr ""
 
-#: ../messages.c:806 ../messages.c:2775
+#: ../messages.c:806 ../messages.c:2778
 msgid "Move"
 msgstr ""
 
@@ -1232,11 +1236,11 @@ msgstr ""
 msgid "Subject (optional):"
 msgstr ""
 
-#: ../messages.c:2585 ../messages.c:2688 ../paging.c:55
+#: ../messages.c:2585 ../messages.c:2691 ../paging.c:55
 msgid "Send message"
 msgstr ""
 
-#: ../messages.c:2587 ../messages.c:2690
+#: ../messages.c:2587 ../messages.c:2693
 msgid "Post message"
 msgstr ""
 
@@ -1244,19 +1248,27 @@ msgstr ""
 msgid "--- forwarded message ---"
 msgstr ""
 
-#: ../messages.c:2683 ../roomops.c:1354 ../roomops.c:1384
+#: ../messages.c:2668
+msgid "Attachments:"
+msgstr ""
+
+#: ../messages.c:2683
+msgid "Attach file:"
+msgstr ""
+
+#: ../messages.c:2686 ../roomops.c:1356 ../roomops.c:1386
 msgid "Add"
 msgstr ""
 
-#: ../messages.c:2748
+#: ../messages.c:2751
 msgid "Confirm move of message"
 msgstr ""
 
-#: ../messages.c:2755
+#: ../messages.c:2758
 msgid "Move this message to:"
 msgstr ""
 
-#: ../messages.c:2799
+#: ../messages.c:2802
 #, c-format
 msgid "The message was not moved."
 msgstr ""
@@ -1453,216 +1465,220 @@ msgstr ""
 msgid "Click on any room to un-zap it and goto that room.\n"
 msgstr ""
 
-#: ../roomops.c:396
+#: ../roomops.c:299
+msgid "View as:"
+msgstr ""
+
+#: ../roomops.c:398
 msgid "View contacts"
 msgstr ""
 
-#: ../roomops.c:407
+#: ../roomops.c:409
 msgid "Day view"
 msgstr ""
 
-#: ../roomops.c:416
+#: ../roomops.c:418
 msgid "Month view"
 msgstr ""
 
-#: ../roomops.c:427
+#: ../roomops.c:429
 msgid "View tasks"
 msgstr ""
 
-#: ../roomops.c:438
+#: ../roomops.c:440
 msgid "View notes"
 msgstr ""
 
-#: ../roomops.c:449
+#: ../roomops.c:451
 msgid "View message list"
 msgstr ""
 
-#: ../roomops.c:474
+#: ../roomops.c:476
 msgid "Add new contact"
 msgstr ""
 
-#: ../roomops.c:483
+#: ../roomops.c:485
 msgid "Add new event"
 msgstr ""
 
-#: ../roomops.c:492
+#: ../roomops.c:494
 msgid "Add new task"
 msgstr ""
 
-#: ../roomops.c:501
+#: ../roomops.c:503
 msgid "Add new note"
 msgstr ""
 
-#: ../roomops.c:523
+#: ../roomops.c:525
 msgid ""
 "Leave all messages marked as unread, go to next room with unread messages"
 msgstr ""
 
-#: ../roomops.c:524
+#: ../roomops.c:526
 msgid "Skip this room"
 msgstr ""
 
-#: ../roomops.c:534
+#: ../roomops.c:536
 msgid "Mark all messages as read, go to next room with unread messages"
 msgstr ""
 
-#: ../roomops.c:895
+#: ../roomops.c:897
 msgid "Configuration"
 msgstr ""
 
-#: ../roomops.c:911
+#: ../roomops.c:913
 msgid "Message expire policy"
 msgstr ""
 
-#: ../roomops.c:927
+#: ../roomops.c:929
 msgid "Access controls"
 msgstr ""
 
-#: ../roomops.c:943
+#: ../roomops.c:945
 msgid "Sharing"
 msgstr ""
 
-#: ../roomops.c:959
+#: ../roomops.c:961
 msgid "Mailing list service"
 msgstr ""
 
-#: ../roomops.c:981
+#: ../roomops.c:983
 msgid "Are you sure you want to delete this room?"
 msgstr ""
 
-#: ../roomops.c:983
+#: ../roomops.c:985
 msgid "Delete this room"
 msgstr ""
 
-#: ../roomops.c:986
+#: ../roomops.c:988
 msgid "Set or change the icon for this room's banner"
 msgstr ""
 
-#: ../roomops.c:989
+#: ../roomops.c:991
 msgid "Edit this room's Info file"
 msgstr ""
 
-#: ../roomops.c:998 ../roomops.c:1829
+#: ../roomops.c:1000 ../roomops.c:1833
 msgid "Name of room: "
 msgstr ""
 
-#: ../roomops.c:1005 ../roomops.c:1833
+#: ../roomops.c:1007 ../roomops.c:1837
 msgid "Resides on floor: "
 msgstr ""
 
-#: ../roomops.c:1019 ../roomops.c:1871
+#: ../roomops.c:1021 ../roomops.c:1875
 msgid "Type of room:"
 msgstr ""
 
-#: ../roomops.c:1026
+#: ../roomops.c:1028
 msgid "Public room"
 msgstr ""
 
-#: ../roomops.c:1034
+#: ../roomops.c:1036
 msgid "Private - guess name"
 msgstr ""
 
-#: ../roomops.c:1041
+#: ../roomops.c:1043
 msgid "Private - require password:"
 msgstr ""
 
-#: ../roomops.c:1051 ../roomops.c:1902
+#: ../roomops.c:1053 ../roomops.c:1906
 msgid "Private - invitation only"
 msgstr ""
 
-#: ../roomops.c:1055
+#: ../roomops.c:1057
 msgid "If private, cause current users to forget room"
 msgstr ""
 
-#: ../roomops.c:1063
+#: ../roomops.c:1065
 msgid "Preferred users only"
 msgstr ""
 
-#: ../roomops.c:1069
+#: ../roomops.c:1071
 msgid "Read-only room"
 msgstr ""
 
-#: ../roomops.c:1076
+#: ../roomops.c:1078
 msgid "File directory room"
 msgstr ""
 
-#: ../roomops.c:1079
+#: ../roomops.c:1081
 msgid "Directory name: "
 msgstr ""
 
-#: ../roomops.c:1087
+#: ../roomops.c:1089
 msgid "Uploading allowed"
 msgstr ""
 
-#: ../roomops.c:1093
+#: ../roomops.c:1095
 msgid "Downloading allowed"
 msgstr ""
 
-#: ../roomops.c:1099
+#: ../roomops.c:1101
 msgid "Visible directory"
 msgstr ""
 
-#: ../roomops.c:1108
+#: ../roomops.c:1110
 msgid "Network shared room"
 msgstr ""
 
-#: ../roomops.c:1114
+#: ../roomops.c:1116
 msgid "Permanent (does not auto-purge)"
 msgstr ""
 
-#: ../roomops.c:1119
+#: ../roomops.c:1121
 msgid "Anonymous messages"
 msgstr ""
 
-#: ../roomops.c:1127
+#: ../roomops.c:1129
 msgid "No anonymous messages"
 msgstr ""
 
-#: ../roomops.c:1133
+#: ../roomops.c:1135
 msgid "All messages are anonymous"
 msgstr ""
 
-#: ../roomops.c:1139
+#: ../roomops.c:1141
 msgid "Prompt user when entering messages"
 msgstr ""
 
-#: ../roomops.c:1145
+#: ../roomops.c:1147
 msgid "Room aide: "
 msgstr ""
 
-#: ../roomops.c:1217
+#: ../roomops.c:1219
 msgid "Shared with"
 msgstr ""
 
-#: ../roomops.c:1220
+#: ../roomops.c:1222
 msgid "Not shared with"
 msgstr ""
 
-#: ../roomops.c:1225 ../roomops.c:1270
+#: ../roomops.c:1227 ../roomops.c:1272
 msgid "Remote node name"
 msgstr ""
 
-#: ../roomops.c:1227 ../roomops.c:1272
+#: ../roomops.c:1229 ../roomops.c:1274
 msgid "Remote room name"
 msgstr ""
 
-#: ../roomops.c:1229 ../roomops.c:1274
+#: ../roomops.c:1231 ../roomops.c:1276
 msgid "Actions"
 msgstr ""
 
-#: ../roomops.c:1262
+#: ../roomops.c:1264
 msgid "Unshare"
 msgstr ""
 
-#: ../roomops.c:1299
+#: ../roomops.c:1301
 msgid "Share"
 msgstr ""
 
-#: ../roomops.c:1307
+#: ../roomops.c:1309
 msgid "Notes:"
 msgstr ""
 
-#: ../roomops.c:1308
+#: ../roomops.c:1310
 msgid ""
 "When sharing a room, it must be shared from both ends.  Adding a node to the "
 "'shared' list sends messages out, but in order to receive messages, the "
@@ -1672,148 +1688,152 @@ msgid ""
 "remote node must also configure the name of the room here.</UL></I><br />\n"
 msgstr ""
 
-#: ../roomops.c:1329
+#: ../roomops.c:1331
 msgid ""
 "<i>The contents of this room are being mailed <b>as individual messages</b> "
 "to the following list recipients:</i><br /><br />\n"
 msgstr ""
 
-#: ../roomops.c:1346 ../roomops.c:1376
+#: ../roomops.c:1348 ../roomops.c:1378
 msgid "(remove)"
 msgstr ""
 
-#: ../roomops.c:1359
+#: ../roomops.c:1361
 msgid ""
 "<i>The contents of this room are being mailed <b>in digest form</b> to the "
 "following list recipients:</i><br /><br />\n"
 msgstr ""
 
-#: ../roomops.c:1390
+#: ../roomops.c:1392
 msgid ""
 "This room is configured to allow self-service subscribe/unsubscribe requests."
 msgstr ""
 
-#: ../roomops.c:1393
+#: ../roomops.c:1395
 msgid "Click to disable."
 msgstr ""
 
-#: ../roomops.c:1395
+#: ../roomops.c:1397
 msgid "The URL for subscribe/unsubscribe is: "
 msgstr ""
 
-#: ../roomops.c:1401
+#: ../roomops.c:1403
 msgid ""
 "This room is <i>not</i> configured to allow self-service subscribe/"
 "unsubscribe requests."
 msgstr ""
 
-#: ../roomops.c:1405
+#: ../roomops.c:1407
 msgid "Click to enable."
 msgstr ""
 
-#: ../roomops.c:1434
+#: ../roomops.c:1436
 msgid "Message expire policy for this room"
 msgstr ""
 
-#: ../roomops.c:1440
+#: ../roomops.c:1442
 msgid "Use the default policy for this floor"
 msgstr ""
 
-#: ../roomops.c:1444 ../roomops.c:1470 ../siteconfig.c:769 ../siteconfig.c:794
+#: ../roomops.c:1446 ../roomops.c:1473 ../siteconfig.c:769 ../siteconfig.c:794
 msgid "Never automatically expire messages"
 msgstr ""
 
-#: ../roomops.c:1451 ../roomops.c:1478 ../siteconfig.c:777 ../siteconfig.c:802
+#: ../roomops.c:1450 ../roomops.c:1477 ../siteconfig.c:773 ../siteconfig.c:798
+msgid "Expire by message count"
+msgstr ""
+
+#: ../roomops.c:1454 ../roomops.c:1481 ../siteconfig.c:777 ../siteconfig.c:802
 msgid "Expire by message age"
 msgstr ""
 
-#: ../roomops.c:1453 ../roomops.c:1480 ../siteconfig.c:779 ../siteconfig.c:804
+#: ../roomops.c:1456 ../roomops.c:1483 ../siteconfig.c:779 ../siteconfig.c:804
 msgid "Number of messages or days: "
 msgstr ""
 
-#: ../roomops.c:1460
+#: ../roomops.c:1463
 msgid "Message expire policy for this floor"
 msgstr ""
 
-#: ../roomops.c:1466
+#: ../roomops.c:1469
 msgid "Use the system default"
 msgstr ""
 
-#: ../roomops.c:1474 ../siteconfig.c:773 ../siteconfig.c:798
-msgid "Expire by message count"
-msgstr ""
-
-#: ../roomops.c:1541 ../roomops.c:2880
+#: ../roomops.c:1544 ../roomops.c:2884
 msgid "Cancelled.  Changes were not saved."
 msgstr ""
 
-#: ../roomops.c:1680
+#: ../roomops.c:1683
 msgid "Your changes have been saved."
 msgstr ""
 
-#: ../roomops.c:1712
+#: ../roomops.c:1715
 #, c-format
 msgid "<B><I>User %s kicked out of room %s.</I></B>\n"
 msgstr ""
 
-#: ../roomops.c:1726
+#: ../roomops.c:1729
 #, c-format
 msgid "<B><I>User %s invited to room %s.</I></B>\n"
 msgstr ""
 
-#: ../roomops.c:1754
+#: ../roomops.c:1757
 msgid ""
 "The users listed below have access to this room.  To remove a user from the "
 "access list, select the user name from the list and click 'Kick'."
 msgstr ""
 
-#: ../roomops.c:1774
+#: ../roomops.c:1777
 msgid "Kick"
 msgstr ""
 
-#: ../roomops.c:1778
+#: ../roomops.c:1781
 msgid ""
 "To grant another user access to this room, enter the user name in the box "
 "below and click 'Invite'."
 msgstr ""
 
-#: ../roomops.c:1788
+#: ../roomops.c:1787
+msgid "Invite:"
+msgstr ""
+
+#: ../roomops.c:1792
 msgid "Invite"
 msgstr ""
 
-#: ../roomops.c:1851
+#: ../roomops.c:1855
 msgid "Default view for room: "
 msgstr ""
 
-#: ../roomops.c:1880
+#: ../roomops.c:1884
 msgid "Public (automatically appears to everyone)"
 msgstr ""
 
-#: ../roomops.c:1887
+#: ../roomops.c:1891
 msgid "Private - hidden (accessible to anyone who knows its name)"
 msgstr ""
 
-#: ../roomops.c:1894
+#: ../roomops.c:1898
 msgid "Private - require password: "
 msgstr ""
 
-#: ../roomops.c:1910
+#: ../roomops.c:1914
 msgid "Personal (mailbox for you only)"
 msgstr ""
 
-#: ../roomops.c:1915
+#: ../roomops.c:1919
 msgid "Create new room"
 msgstr ""
 
-#: ../roomops.c:1983
+#: ../roomops.c:1987
 msgid "Cancelled.  No new room was created."
 msgstr ""
 
-#: ../roomops.c:2026
+#: ../roomops.c:2030
 msgid "Go to a hidden room"
 msgstr ""
 
-#: ../roomops.c:2037
+#: ../roomops.c:2041
 msgid ""
 "If you know the name of a hidden (guess-name) or passworded room, you can "
 "enter that room by typing its name below.  Once you gain access to a private "
@@ -1821,30 +1841,30 @@ msgid ""
 "returning here."
 msgstr ""
 
-#: ../roomops.c:2049
+#: ../roomops.c:2053
 msgid "Enter room name:"
 msgstr ""
 
-#: ../roomops.c:2056
+#: ../roomops.c:2060
 msgid "Enter room password:"
 msgstr ""
 
-#: ../roomops.c:2065
+#: ../roomops.c:2069
 msgid "Go there"
 msgstr ""
 
-#: ../roomops.c:2118
+#: ../roomops.c:2122
 msgid "Zap (forget/unsubscribe) the current room"
 msgstr ""
 
-#: ../roomops.c:2123
+#: ../roomops.c:2127
 #, c-format
 msgid ""
 "If you select this option, <em>%s</em> will disappear from your room list.  "
 "Is this what you wish to do?<br />\n"
 msgstr ""
 
-#: ../roomops.c:2128
+#: ../roomops.c:2132
 msgid "Zap this room"
 msgstr ""
 

diff --git a/webcit/roomops.c b/webcit/roomops.c
index e461bcb1e95354f62c0726a473e45bac1758cf5f..1ce681fafd2f71cd13184e583264590c2d383321 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -295,7 +295,9 @@ void embed_view_o_matic(void) {
        int i;
 
        wprintf("<form name=\"viewomatic\" action=\"changeview\">\n"
-               "<span class=\"room_banner_new_messages\">View as: "
+               "<span class=\"room_banner_new_messages\">");
+       wprintf(_("View as:"));
+       wprintf(" "
                "<SELECT NAME=\"newview\" SIZE=\"1\" "
                "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
                " font-size: 7pt; background: #444455; color: #ddddcc;\" "
@@ -1445,7 +1447,8 @@ void display_editroom(void)
                wprintf("<br />\n");
                wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
                        ((roompolicy == 2) ? "CHECKED" : "") );
-               wprintf("Expire by message count<br />\n");
+               wprintf(_("Expire by message count"));
+               wprintf("<br />\n");
                wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
                        ((roompolicy == 3) ? "CHECKED" : "") );
                wprintf(_("Expire by message age"));
@@ -1781,7 +1784,8 @@ void display_whok(void)
 
         wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-        wprintf("Invite: ");
+        wprintf(_("Invite:"));
+       wprintf(" ");
         wprintf("<input type=\"text\" name=\"username\" style=\"width:100%%\"><br />\n"
                "<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
                "<input type=\"submit\" value=\"%s\">"

diff --git a/webcit/webcit.h b/webcit/webcit.h
index f30d1530eb59cb68a3716501673cb3eaaddb50d6..1e97c65d888cd6cb97f3fdcab96a181bd907d257 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -70,9 +70,36 @@
 #endif
 #endif
 
+
+
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
+/* Work around PACKAGE/VERSION defs that are (not supposed to be?) in ical.h */
+#ifdef PACKAGE
+# define CTDL_PACKAGE PACKAGE
+# undef PACKAGE
+#endif
+#ifdef VERSION
+# define CTDL_VERSION VERSION
+# undef VERSION
+#endif
 #include <ical.h>
+#ifdef CTDL_PACKAGE
+# ifdef PACKAGE
+#  undef PACKAGE
+# endif
+# define PACKAGE CTDL_PACKAGE
+# undef CTDL_PACKAGE
 #endif
+#ifdef CTDL_VERSION
+# ifdef VERSION
+#  undef VERSION
+# endif
+# define VERSION CTDL_VERSION
+# undef CTDL_VERSION
+#endif
+#endif
+
+
 
 #ifdef HAVE_OPENSSL
 /* Work around RedHat's b0rken OpenSSL includes */