banana evolves

git-archimport-id: opensource@polytechnique.org--2005/banana--mainline--1.0--patch-4

diff --git a/Changelog b/Changelog
index 6eb47e6..f06f42f 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,5 @@
 ================================================================================
-VERSION 0.99
+VERSION 1.0
 
 Fri, 07 Jan 2005                                       Pierre Habouzit <pierre.habouzit@m4x.org>
 

diff --git a/po/Makefile b/po/Makefile
index 781d409..c17719f 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,28 +3,30 @@
 # $Horde: horde/po/Makefile,v 1.2.2.3 2002/05/20 17:36:22 jan Exp $
 #
 
-APPLICATION = banana
 MSGFMT = msgfmt --statistics -c -v -o
 MSGFMTSOL = msgfmt -v -o
 MSGMERGE = msgmerge -U
-XGETTEXT = xgettext --from-code=iso-8859-15 -j -k_b_ -o
-PHPFILES = find banana -name "*.php"
+LANGS:=$(shell ls *.po|sed -e s/\.po$$//)
+APPLICATION = banana
+
+all: banana.pot ${LANGS:=.lang}
+       if test "${OSTYPE}" = "solaris"; then \
+               echo "You'll probably get some warnings on Solaris. This is normal."; \
+       fi;
 
+banana.pot: ../banana/*.php
+       xgettext --from-code=iso-8859-15 -j -k_b_ -o banana.pot $<
 
-all: install
+%.lang: ../locale/%/LC_MESSAGES/banana.mo %.po
+       @echo Updating for lang %
 
-xgettext:
-       cd .. && ${XGETTEXT} po/${APPLICATION}.pot `${PHPFILES}`
 
-%.po: ${APPLICATION}.pot
-       @echo "Updating .po files from .pot:"
+%.po: banana.pot
        ${MSGMERGE} $@ $<
 
-install: *.po
-       @echo "Checking for os ... ${OSTYPE}"; \
-       if test "${OSTYPE}" = "solaris"; then \
-               echo "You'll probably get some warnings on Solaris. This is normal."; \
-       fi; \
+       
+
+build: *.po 
        for LOCALE in `ls *.po | sed 's/\.[^.]*$$//g'`; do \
                if test $${LOCALE}.po = "messages.po"; then \
                        continue; \

diff --git a/po/banana.pot b/po/banana.pot
index a356025..b59e705 100644 (file)
--- a/po/banana.pot
+++ b/po/banana.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-07 19:18+0100\n"
+"POT-Creation-Date: 2005-01-07 19:47+0100\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,142 +16,152 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: banana/groups.inc.php:87
+#: banana/groups.inc.php:87 ../banana/groups.inc.php:87
 msgid "Total"
 msgstr ""
 
-#: banana/groups.inc.php:89
+#: banana/groups.inc.php:89 ../banana/groups.inc.php:89
 msgid "Abo."
 msgstr ""
 
-#: banana/groups.inc.php:91
+#: banana/groups.inc.php:91 ../banana/groups.inc.php:91
 msgid "Nouveaux"
 msgstr ""
 
 #: banana/groups.inc.php:93 banana/banana.inc.php:234
+#: ../banana/groups.inc.php:93 ../banana/banana.inc.php:234
 msgid "Nom"
 msgstr ""
 
-#: banana/groups.inc.php:93
+#: banana/groups.inc.php:93 ../banana/groups.inc.php:93
 msgid "Description"
 msgstr ""
 
-#: banana/misc.inc.php:33
+#: banana/misc.inc.php:33 ../banana/misc.inc.php:33
 msgid "De"
 msgstr ""
 
 #: banana/misc.inc.php:34 banana/spool.inc.php:360 banana/banana.inc.php:235
+#: ../banana/misc.inc.php:34 ../banana/spool.inc.php:360
+#: ../banana/banana.inc.php:235
 msgid "Sujet"
 msgstr ""
 
-#: banana/misc.inc.php:35 banana/banana.inc.php:236
+#: banana/misc.inc.php:35 banana/banana.inc.php:236 ../banana/misc.inc.php:35
+#: ../banana/banana.inc.php:236
 msgid "Forums"
 msgstr ""
 
-#: banana/misc.inc.php:36
+#: banana/misc.inc.php:36 ../banana/misc.inc.php:36
 msgid "Suivi-à"
 msgstr ""
 
-#: banana/misc.inc.php:37 banana/spool.inc.php:359
+#: banana/misc.inc.php:37 banana/spool.inc.php:359 ../banana/misc.inc.php:37
+#: ../banana/spool.inc.php:359
 msgid "Date"
 msgstr ""
 
-#: banana/misc.inc.php:38 banana/banana.inc.php:238
+#: banana/misc.inc.php:38 banana/banana.inc.php:238 ../banana/misc.inc.php:38
+#: ../banana/banana.inc.php:238
 msgid "Organisation"
 msgstr ""
 
-#: banana/misc.inc.php:39
+#: banana/misc.inc.php:39 ../banana/misc.inc.php:39
 msgid "Références"
 msgstr ""
 
-#: banana/misc.inc.php:40
+#: banana/misc.inc.php:40 ../banana/misc.inc.php:40
 msgid "Image"
 msgstr ""
 
-#: banana/misc.inc.php:115
+#: banana/misc.inc.php:115 ../banana/misc.inc.php:115
 msgid "hier"
 msgstr ""
 
-#: banana/misc.inc.php:148
+#: banana/misc.inc.php:148 ../banana/misc.inc.php:148
 msgid "Liste des forums"
 msgstr ""
 
 #: banana/misc.inc.php:150 banana/banana.inc.php:140
+#: ../banana/misc.inc.php:150 ../banana/banana.inc.php:140
 msgid "Abonnements"
 msgstr ""
 
 #: banana/misc.inc.php:156 banana/banana.inc.php:230
+#: ../banana/misc.inc.php:156 ../banana/banana.inc.php:230
 msgid "Nouveau message"
 msgstr ""
 
-#: banana/misc.inc.php:171
+#: banana/misc.inc.php:171 ../banana/misc.inc.php:171
 msgid "Répondre"
 msgstr ""
 
-#: banana/misc.inc.php:174
+#: banana/misc.inc.php:174 ../banana/misc.inc.php:174
 msgid "Annuler ce message"
 msgstr ""
 
 #: banana/post.inc.php:100 banana/banana.inc.php:233
+#: ../banana/post.inc.php:100 ../banana/banana.inc.php:233
 msgid "En-têtes"
 msgstr ""
 
 #: banana/post.inc.php:111 banana/banana.inc.php:239
+#: ../banana/post.inc.php:111 ../banana/banana.inc.php:239
 msgid "Corps"
 msgstr ""
 
-#: banana/post.inc.php:114
+#: banana/post.inc.php:114 ../banana/post.inc.php:114
 msgid "apercu"
 msgstr ""
 
-#: banana/spool.inc.php:361
+#: banana/spool.inc.php:361 ../banana/spool.inc.php:361
 msgid "Auteur"
 msgstr ""
 
-#: banana/spool.inc.php:372
+#: banana/spool.inc.php:372 ../banana/spool.inc.php:372
 msgid "Aucun message dans ce forum"
 msgstr ""
 
-#: banana/banana.inc.php:54
+#: banana/banana.inc.php:54 ../banana/banana.inc.php:54
 msgid "Impossible de contacter le serveur"
 msgstr ""
 
-#: banana/banana.inc.php:93
+#: banana/banana.inc.php:93 ../banana/banana.inc.php:93
 msgid "Voulez-vous vraiment annuler ce message ?"
 msgstr ""
 
-#: banana/banana.inc.php:124
+#: banana/banana.inc.php:124 ../banana/banana.inc.php:124
 msgid "Les forums de Banana"
 msgstr ""
 
-#: banana/banana.inc.php:126
+#: banana/banana.inc.php:126 ../banana/banana.inc.php:126
 msgid "Les forums suivants ont été créés depuis ton dernier passage :"
 msgstr ""
 
-#: banana/banana.inc.php:175
+#: banana/banana.inc.php:175 ../banana/banana.inc.php:175
 msgid "Impossible d'accéder au message.   Le message a peut-être été annulé"
 msgstr ""
 
-#: banana/banana.inc.php:179
+#: banana/banana.inc.php:179 ../banana/banana.inc.php:179
 msgid "Message"
 msgstr ""
 
-#: banana/banana.inc.php:194
+#: banana/banana.inc.php:194 ../banana/banana.inc.php:194
 msgid "Vous n'avez pas les permissions pour annuler ce message"
 msgstr ""
 
-#: banana/banana.inc.php:208
+#: banana/banana.inc.php:208 ../banana/banana.inc.php:208
 msgid "Impossible d'annuler le message"
 msgstr ""
 
-#: banana/banana.inc.php:222
+#: banana/banana.inc.php:222 ../banana/banana.inc.php:222
 msgid "a écrit"
 msgstr ""
 
-#: banana/banana.inc.php:237
+#: banana/banana.inc.php:237 ../banana/banana.inc.php:237
 msgid "Suivi à"
 msgstr ""
 
-#: banana/banana.inc.php:275
+#: banana/banana.inc.php:275 ../banana/banana.inc.php:275
 msgid "Impossible de poster le message"
 msgstr ""

diff --git a/po/fr.po b/po/fr.po
index 889b0ca..9dbfe08 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-07 19:18+0100\n"
+"POT-Creation-Date: 2005-01-07 19:35+0100\n"
 "PO-Revision-Date: 2005-01-02 17:13+0100\n"
 "Last-Translator: Pierre Habouzit <pierre.habouzit@m4x.org>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -16,143 +16,152 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: banana/groups.inc.php:87
+#: banana/groups.inc.php:87 ../banana/groups.inc.php:87
 msgid "Total"
 msgstr "Total"
 
-#: banana/groups.inc.php:89
+#: banana/groups.inc.php:89 ../banana/groups.inc.php:89
 msgid "Abo."
 msgstr "Abo."
 
-#: banana/groups.inc.php:91
+#: banana/groups.inc.php:91 ../banana/groups.inc.php:91
 msgid "Nouveaux"
 msgstr "Nouveaux"
 
 #: banana/groups.inc.php:93 banana/banana.inc.php:234
+#: ../banana/groups.inc.php:93 ../banana/banana.inc.php:234
 msgid "Nom"
 msgstr "Nom"
 
-#: banana/groups.inc.php:93
+#: banana/groups.inc.php:93 ../banana/groups.inc.php:93
 msgid "Description"
 msgstr "Description"
 
-#: banana/misc.inc.php:33
+#: banana/misc.inc.php:33 ../banana/misc.inc.php:33
 msgid "De"
 msgstr "De"
 
 #: banana/misc.inc.php:34 banana/spool.inc.php:360 banana/banana.inc.php:235
+#: ../banana/misc.inc.php:34 ../banana/spool.inc.php:360
+#: ../banana/banana.inc.php:235
 msgid "Sujet"
 msgstr "Sujet"
 
-#: banana/misc.inc.php:35 banana/banana.inc.php:236
+#: banana/misc.inc.php:35 banana/banana.inc.php:236 ../banana/misc.inc.php:35
+#: ../banana/banana.inc.php:236
 msgid "Forums"
 msgstr "Forums"
 
-#: banana/misc.inc.php:36
+#: banana/misc.inc.php:36 ../banana/misc.inc.php:36
 msgid "Suivi-à"
 msgstr "Suivi-à"
 
-#: banana/misc.inc.php:37 banana/spool.inc.php:359
+#: banana/misc.inc.php:37 banana/spool.inc.php:359 ../banana/misc.inc.php:37
+#: ../banana/spool.inc.php:359
 msgid "Date"
 msgstr "Date"
 
-#: banana/misc.inc.php:38 banana/banana.inc.php:238
+#: banana/misc.inc.php:38 banana/banana.inc.php:238 ../banana/misc.inc.php:38
+#: ../banana/banana.inc.php:238
 msgid "Organisation"
 msgstr "Organisation"
 
-#: banana/misc.inc.php:39
+#: banana/misc.inc.php:39 ../banana/misc.inc.php:39
 msgid "Références"
 msgstr "Références"
 
-#: banana/misc.inc.php:40
+#: banana/misc.inc.php:40 ../banana/misc.inc.php:40
 msgid "Image"
 msgstr "Image"
 
-#: banana/misc.inc.php:115
+#: banana/misc.inc.php:115 ../banana/misc.inc.php:115
 msgid "hier"
 msgstr "hier"
 
-#: banana/misc.inc.php:148
+#: banana/misc.inc.php:148 ../banana/misc.inc.php:148
 msgid "Liste des forums"
 msgstr "Liste des forums"
 
 #: banana/misc.inc.php:150 banana/banana.inc.php:140
+#: ../banana/misc.inc.php:150 ../banana/banana.inc.php:140
 msgid "Abonnements"
 msgstr "Abonnements"
 
 #: banana/misc.inc.php:156 banana/banana.inc.php:230
+#: ../banana/misc.inc.php:156 ../banana/banana.inc.php:230
 msgid "Nouveau message"
 msgstr "Nouveau message"
 
-#: banana/misc.inc.php:171
+#: banana/misc.inc.php:171 ../banana/misc.inc.php:171
 msgid "Répondre"
 msgstr "Répondre"
 
-#: banana/misc.inc.php:174
+#: banana/misc.inc.php:174 ../banana/misc.inc.php:174
 msgid "Annuler ce message"
 msgstr "Annuler ce message"
 
 #: banana/post.inc.php:100 banana/banana.inc.php:233
+#: ../banana/post.inc.php:100 ../banana/banana.inc.php:233
 msgid "En-têtes"
 msgstr "En-têtes"
 
 #: banana/post.inc.php:111 banana/banana.inc.php:239
+#: ../banana/post.inc.php:111 ../banana/banana.inc.php:239
 msgid "Corps"
 msgstr "Corps"
 
-#: banana/post.inc.php:114
+#: banana/post.inc.php:114 ../banana/post.inc.php:114
 msgid "apercu"
 msgstr "apercu"
 
-#: banana/spool.inc.php:361
+#: banana/spool.inc.php:361 ../banana/spool.inc.php:361
 msgid "Auteur"
 msgstr "Auteur"
 
-#: banana/spool.inc.php:372
+#: banana/spool.inc.php:372 ../banana/spool.inc.php:372
 msgid "Aucun message dans ce forum"
 msgstr "Aucun message dans ce forum"
 
-#: banana/banana.inc.php:54
+#: banana/banana.inc.php:54 ../banana/banana.inc.php:54
 msgid "Impossible de contacter le serveur"
 msgstr "Impossible de contacter le serveur"
 
-#: banana/banana.inc.php:93
+#: banana/banana.inc.php:93 ../banana/banana.inc.php:93
 msgid "Voulez-vous vraiment annuler ce message ?"
 msgstr "Voulez-vous vraiment annuler ce message ?"
 
-#: banana/banana.inc.php:124
+#: banana/banana.inc.php:124 ../banana/banana.inc.php:124
 msgid "Les forums de Banana"
 msgstr "Les forums de Banana"
 
-#: banana/banana.inc.php:126
+#: banana/banana.inc.php:126 ../banana/banana.inc.php:126
 msgid "Les forums suivants ont été créés depuis ton dernier passage :"
 msgstr "Les forums suivants ont été créés depuis ton dernier passage :"
 
-#: banana/banana.inc.php:175
+#: banana/banana.inc.php:175 ../banana/banana.inc.php:175
 msgid "Impossible d'accéder au message.   Le message a peut-être été annulé"
 msgstr "Impossible d'accéder au message.   Le message a peut-être été annulé"
 
-#: banana/banana.inc.php:179
+#: banana/banana.inc.php:179 ../banana/banana.inc.php:179
 msgid "Message"
 msgstr "Message"
 
-#: banana/banana.inc.php:194
+#: banana/banana.inc.php:194 ../banana/banana.inc.php:194
 msgid "Vous n'avez pas les permissions pour annuler ce message"
 msgstr "Vous n'avez pas les permissions pour annuler ce message"
 
-#: banana/banana.inc.php:208
+#: banana/banana.inc.php:208 ../banana/banana.inc.php:208
 msgid "Impossible d'annuler le message"
 msgstr "Impossible d'annuler le message"
 
-#: banana/banana.inc.php:222
+#: banana/banana.inc.php:222 ../banana/banana.inc.php:222
 msgid "a écrit"
 msgstr "a écrit"
 
-#: banana/banana.inc.php:237
+#: banana/banana.inc.php:237 ../banana/banana.inc.php:237
 msgid "Suivi à"
 msgstr "Suivi à"
 
-#: banana/banana.inc.php:275
+#: banana/banana.inc.php:275 ../banana/banana.inc.php:275
 msgid "Impossible de poster le message"
 msgstr "Impossible de poster le message"
-