* create-pot.sh: now creates a new webcit.pot file and automatically merges

  it into all *.po files, allowing an easy way for translators to access
  new strings.
* axdefs[] (Access level definitions) -- now ready for localization.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index e472ca5f9c2f6e5662eca9b21dff7c767c5e2a19..67e7fbd24017df1840e23974097769cb2d3b23cf 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,10 @@
 $Id$
 
+Mon Nov 21 22:30:31 EST 2005 ajc
+* create-pot.sh: now creates a new webcit.pot file and automatically merges
+  it into all *.po files, allowing an easy way for translators to access
+  new strings.
+* axdefs[] (Access level definitions) -- now ready for localization.
 
 Mon Nov 21 16:59:43 CET 2005 dothebart
 * add some script to wrap the debian package build that does some magic about

diff --git a/webcit/auth.c b/webcit/auth.c
index 9d941b87ee739e8a446c0f675f83af9bfb4adca4..87531b931179421ed5c37b2eed3f1962070816e1 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -7,16 +7,18 @@
 
 #include "webcit.h"
 
-char *axdefs[] =
-{
-       "Deleted",
-       "New User",
-       "Problem User",
-       "Local User",
-       "Network User",
-       "Preferred User",
-       "Aide"
-};
+char *axdefs[7];
+
+void initialize_axdefs(void) {
+       axdefs[0] = _("Deleted");
+       axdefs[1] = _("New User");
+       axdefs[2] = _("Problem User");
+       axdefs[3] = _("Local User");
+       axdefs[4] = _("Network User");
+       axdefs[5] = _("Preferred User");
+       axdefs[6] = _("Aide");
+}
+
 
 /*
  * Display the login screen

diff --git a/webcit/configure.in b/webcit/configure.in
index 33679ea87cb1a2770a579040792f909e22361419..09df7eea8c081036a0f746726239de8730f1c79a 100644 (file)
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -4,7 +4,7 @@ AC_INIT(webserver.c)
 
 
 PACKAGE=webcit
-VERSION=6.21
+VERSION=6.40
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)

diff --git a/webcit/po/create-pot.sh b/webcit/po/create-pot.sh
index 91a03c544914fa444b9f07b90a37fbe2029d2a6c..df6cfb951bea694f3ad5bec179f63dc364ed81ee 100644 (file)
--- a/webcit/po/create-pot.sh
+++ b/webcit/po/create-pot.sh
@@ -1,7 +1,14 @@
 #!/bin/bash
 
+echo Updating webcit.pot from strings in the source code ...
 xgettext \
        --copyright-holder='The Citadel Project - http://www.citadel.org' \
        -k_ \
        -o webcit.pot \
        ../*.c
+
+for x in *.po
+do
+       echo Merging webcit.pot into $x ...
+       msgmerge $x webcit.pot -o $x
+done

diff --git a/webcit/po/de.po b/webcit/po/de.po
index 2d17a013135436c90a759e7827c3ea1286c9388d..2cbb6fe6d069c4823fc671456fc0176476c1f3fc 100644 (file)
--- a/webcit/po/de.po
+++ b/webcit/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-18 23:54-0500\n"
+"POT-Creation-Date: 2005-11-21 22:25-0500\n"
 "PO-Revision-Date: 2005-11-13 15:22+100\n"
 "Last-Translator: Wilfried Goesgens <w.goesgens@chaosindustries.de>\n"
 "Language-Team: German <LL@li.org>\n"
@@ -16,7 +16,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../auth.c:37
+#: ../auth.c:13
+#, fuzzy
+msgid "Deleted"
+msgstr "Löschen"
+
+#: ../auth.c:14 ../auth.c:56
+msgid "New User"
+msgstr "Neuer Benutzer"
+
+#: ../auth.c:15
+#, fuzzy
+msgid "Problem User"
+msgstr "Neuer Benutzer"
+
+#: ../auth.c:16
+msgid "Local User"
+msgstr ""
+
+#: ../auth.c:17
+#, fuzzy
+msgid "Network User"
+msgstr "Neuer Benutzer"
+
+#: ../auth.c:18
+#, fuzzy
+msgid "Preferred User"
+msgstr "nur Privilegierte Benutzer"
+
+#: ../auth.c:19
+#, fuzzy
+msgid "Aide"
+msgstr "Mittelinitial"
+
+#: ../auth.c:39
 #, c-format
 msgid ""
 "<ul><li><b>If you already have an account on %s</b>, enter your user name "
@@ -38,32 +71,28 @@ msgstr ""
 "fallen</li>\n"
 "<br /></ul>"
 
-#: ../auth.c:53
+#: ../auth.c:55
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../auth.c:54
-msgid "New User"
-msgstr "Neuer Benutzer"
-
-#: ../auth.c:55 ../paging.c:474
+#: ../auth.c:57 ../paging.c:474
 msgid "Exit"
 msgstr "Ende"
 
-#: ../auth.c:57
+#: ../auth.c:59
 #, c-format
 msgid "%s - powered by Citadel"
 msgstr "%s - mit Citadel-Technologie"
 
-#: ../auth.c:128 ../auth.c:466
+#: ../auth.c:130 ../auth.c:468
 msgid "Blank passwords are not allowed."
 msgstr "Leere Passwörter sind nicht zulässig."
 
-#: ../auth.c:149
+#: ../auth.c:151
 msgid "Your password was not accepted."
 msgstr "Ihr Passwort wurde nicht akzeptiert"
 
-#: ../auth.c:241
+#: ../auth.c:243
 msgid ""
 "This program was unable to connect or stay connected to the Citadel server.  "
 "Please report this problem to your system administrator."
@@ -71,40 +100,40 @@ msgstr ""
 "Dieses Programm konnte keine Verbindung zum Citadel-Server herstellen oder "
 "aufrechterhalten.Bitte wenden Sie sich an Ihren Administrator."
 
-#: ../auth.c:249
+#: ../auth.c:251
 msgid "Close window"
 msgstr "Fenster Schließen"
 
-#: ../auth.c:270 ../mainmenu.c:239
+#: ../auth.c:272 ../mainmenu.c:239
 msgid "Validate new users"
 msgstr "Neue Benutzer überprüfen"
 
-#: ../auth.c:321
+#: ../auth.c:323
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr "Aktuelle Berechtigungen: %d (%s)\n"
 
-#: ../auth.c:329
+#: ../auth.c:331
 msgid "Select access level for this user:"
 msgstr "Berechtigungen dieses Benutzers"
 
-#: ../auth.c:391 ../mainmenu.c:135
+#: ../auth.c:393 ../mainmenu.c:135
 msgid "Change your password"
 msgstr "Ändern Sie Ihr Passwort"
 
-#: ../auth.c:420
+#: ../auth.c:422
 msgid "Enter new password:"
 msgstr "Bitte geben Sie ein neues Passwort ein"
 
-#: ../auth.c:424
+#: ../auth.c:426
 msgid "Enter it again to confirm:"
 msgstr "Nocheinmal zur Verifizierung:"
 
-#: ../auth.c:429
+#: ../auth.c:431
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: ../auth.c:431 ../calendar.c:582 ../event.c:385 ../graphics.c:57
+#: ../auth.c:433 ../calendar.c:582 ../event.c:385 ../graphics.c:57
 #: ../iconbar.c:603 ../mainmenu.c:298 ../messages.c:2585 ../messages.c:2688
 #: ../messages.c:2772 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
 #: ../preferences.c:361 ../roomops.c:1172 ../roomops.c:1499 ../roomops.c:1927
@@ -113,11 +142,11 @@ msgstr "Passwort ändern"
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../auth.c:447
+#: ../auth.c:449
 msgid "Cancelled.  Password was not changed."
 msgstr "Abgebrochen. Passwort wurde nicht gesetzt."
 
-#: ../auth.c:458
+#: ../auth.c:460
 msgid "They don't match.  Password was not changed."
 msgstr "Die Passwörter stimmen nicht überein. Passwort nicht geändert"
 
@@ -1883,11 +1912,11 @@ msgstr "Raum vergessen"
 msgid "Email"
 msgstr "Email:"
 
-#: ../rss.c:60
+#: ../rss.c:62
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#: ../rss.c:79
+#: ../rss.c:81
 msgid "Error retrieving RSS feed: couldn't find messages\n"
 msgstr "Fehler beim laden des RSS-feeds: konnte die Meldung nicht finden\n"
 

diff --git a/webcit/po/webcit.pot b/webcit/po/webcit.pot
index 8ebfa4ca0fefab029d2017a1333c846344d9007b..df56af554f17002a50ba9ef495ca282cc1a03e96 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-11-18 23:54-0500\n"
+"POT-Creation-Date: 2005-11-21 22:25-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"
@@ -16,7 +16,35 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../auth.c:37
+#: ../auth.c:13
+msgid "Deleted"
+msgstr ""
+
+#: ../auth.c:14 ../auth.c:56
+msgid "New User"
+msgstr ""
+
+#: ../auth.c:15
+msgid "Problem User"
+msgstr ""
+
+#: ../auth.c:16
+msgid "Local User"
+msgstr ""
+
+#: ../auth.c:17
+msgid "Network User"
+msgstr ""
+
+#: ../auth.c:18
+msgid "Preferred User"
+msgstr ""
+
+#: ../auth.c:19
+msgid "Aide"
+msgstr ""
+
+#: ../auth.c:39
 #, c-format
 msgid ""
 "<ul><li><b>If you already have an account on %s</b>, enter your user name "
@@ -28,71 +56,67 @@ msgid ""
 "receive any instant messages.<br /></ul>"
 msgstr ""
 
-#: ../auth.c:53
+#: ../auth.c:55
 msgid "Login"
 msgstr ""
 
-#: ../auth.c:54
-msgid "New User"
-msgstr ""
-
-#: ../auth.c:55 ../paging.c:474
+#: ../auth.c:57 ../paging.c:474
 msgid "Exit"
 msgstr ""
 
-#: ../auth.c:57
+#: ../auth.c:59
 #, c-format
 msgid "%s - powered by Citadel"
 msgstr ""
 
-#: ../auth.c:128 ../auth.c:466
+#: ../auth.c:130 ../auth.c:468
 msgid "Blank passwords are not allowed."
 msgstr ""
 
-#: ../auth.c:149
+#: ../auth.c:151
 msgid "Your password was not accepted."
 msgstr ""
 
-#: ../auth.c:241
+#: ../auth.c:243
 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:249
+#: ../auth.c:251
 msgid "Close window"
 msgstr ""
 
-#: ../auth.c:270 ../mainmenu.c:239
+#: ../auth.c:272 ../mainmenu.c:239
 msgid "Validate new users"
 msgstr ""
 
-#: ../auth.c:321
+#: ../auth.c:323
 #, c-format
 msgid "Current access level: %d (%s)\n"
 msgstr ""
 
-#: ../auth.c:329
+#: ../auth.c:331
 msgid "Select access level for this user:"
 msgstr ""
 
-#: ../auth.c:391 ../mainmenu.c:135
+#: ../auth.c:393 ../mainmenu.c:135
 msgid "Change your password"
 msgstr ""
 
-#: ../auth.c:420
+#: ../auth.c:422
 msgid "Enter new password:"
 msgstr ""
 
-#: ../auth.c:424
+#: ../auth.c:426
 msgid "Enter it again to confirm:"
 msgstr ""
 
-#: ../auth.c:429
+#: ../auth.c:431
 msgid "Change password"
 msgstr ""
 
-#: ../auth.c:431 ../calendar.c:582 ../event.c:385 ../graphics.c:57
+#: ../auth.c:433 ../calendar.c:582 ../event.c:385 ../graphics.c:57
 #: ../iconbar.c:603 ../mainmenu.c:298 ../messages.c:2585 ../messages.c:2688
 #: ../messages.c:2772 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
 #: ../preferences.c:361 ../roomops.c:1172 ../roomops.c:1499 ../roomops.c:1927
@@ -101,11 +125,11 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: ../auth.c:447
+#: ../auth.c:449
 msgid "Cancelled.  Password was not changed."
 msgstr ""
 
-#: ../auth.c:458
+#: ../auth.c:460
 msgid "They don't match.  Password was not changed."
 msgstr ""
 
@@ -1807,11 +1831,11 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../rss.c:60
+#: ../rss.c:62
 msgid "Not logged in"
 msgstr ""
 
-#: ../rss.c:79
+#: ../rss.c:81
 msgid "Error retrieving RSS feed: couldn't find messages\n"
 msgstr ""
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 97ed8524583543c2a531a8a279a6d529d8d0d641..7f61f0809bdf61b91a5da456bf7e926ce029716a 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -92,10 +92,10 @@
 #define SLEEPING               180             /* TCP connection timeout */
 #define WEBCIT_TIMEOUT         900             /* WebCit session timeout */
 #define PORT_NUM               2000            /* port number to listen on */
-#define SERVER                 "WebCit v6.31"  /* who's in da house */
+#define SERVER                 "WebCit v6.40"  /* who's in da house */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         631             /* This version of WebCit */
+#define CLIENT_VERSION         640             /* This version of WebCit */
 #define MINIMUM_CIT_VERSION    661             /* min required Citadel ver. */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
@@ -550,6 +550,7 @@ void recp_autocomplete(char *);
 void begin_ajax_response(void);
 void end_ajax_response(void);
 void initialize_viewdefs(void);
+void initialize_axdefs(void);
 
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
 void display_edit_task(void);

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 8a81905270c64ce41184deb0071226432ebf9064..63159c9a2fdcb1d8e19eec17ebbe16d72b94de57 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -475,6 +475,7 @@ int main(int argc, char **argv)
 #endif
 
        initialize_viewdefs();
+       initialize_axdefs();
 
        /*
         * Set up a place to put thread-specific data.