[svn] Retrieving recent modifications from sympa-6.1-branch.

git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10215 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce

Author: sikeda

Makefile.am

@@ -26,7 +26,8 @@ SUBDIRS = src wwsympa soap web_tt2 mail_tt2 doc po po-wwsympa
 EXTRA_DIST = important_changes.pl \
 	     sympa.spec.in \
 	     sympa.spec \
-	     README.charset
+	     README.charset \
+	     etc_README
 CLEANFILES = previous_sympa_version
 
 install-data-hook: installdir installconfig nextstep importantchanges
@@ -77,6 +78,24 @@ installconfig: installdir
 		chown $(USER) data_structure.version || /bin/true; \
 		chgrp $(GROUP) data_structure.version || /bin/true; \
 	fi
+	@for dir in create_list_templates families \
+		global_task_models list_task_models scenari search_filters \
+		mail_tt2 web_tt2; do \
+		if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \
+			echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \
+			install -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \
+		fi; \
+		chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
+		chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
+	done
+	@if [ ! -e $(DESTDIR)$(sysconfdir)/README ]; then \
+		echo "Creating $(DESTDIR)$(sysconfdir)/README"; \
+		$(SED) \
+			-e 's|--sysconfdir--|$(sysconfdir)|' \
+			-e 's|--defaultdir--|$(defaultdir)|' \
+			etc_README > $(DESTDIR)$(sysconfdir)/README; \
+		chmod 444 $(DESTDIR)$(sysconfdir)/README; \
+	fi
 
 nextstep: 
 	@echo ""

etc_README

@@ -0,0 +1,7 @@
+The default configuration files, templates, authorization scenarios and so
+on are located in the --defaultdir--/ hierarchy and are overwritten when
+upgrading Sympa. 
+
+You can customize or extend the default configuration in the
+--sysconfdir--/ hierarchy. Customization for a virtual host are located in
+the --sysconfdir--/my_virtual_robot/ hierarchy.

po-wwsympa/LINGUAS

@@ -1,6 +1,7 @@
 ar
 br
 bg
+ca
 cs
 de
 el

po-wwsympa/ca.po

@@ -4602,6 +4602,17 @@ msgstr ""
 "l'enllaç de la pàgina principal <a href=\"%1/sendpasswd\">Primer inici de "
 "sessió?</a>. Rebreu una contrasenya nova en el correu electrònic."
 
+#. (path_cgi)
+#: web_tt2/help_faquser.tt2:15
+msgid ""
+"<strong>You have no password</strong>. To be given a password, follow the <a "
+"href=\"%1/firstpasswd\">First login?</a> link from the homepage. You will "
+"receive your new password by email."
+msgstr ""
+"<strong>No teniu contrasenya</strong>. Per aconseguir la contrasenya, seguiu "
+"l'enllaç de la pàgina principal <a href=\"%1/firstpasswd\">Primer inici de "
+"sessió?</a>. Rebreu una contrasenya nova en el correu electrònic."
+
 #. (path_cgi)
 #: web_tt2/help_faquser.tt2:16
 msgid ""

po-wwsympa/de.po

@@ -4632,6 +4632,17 @@ msgstr ""
 "klicken Sie den Link <a href=\"%1/sendpasswd\">Erste Anmeldung?</a> auf der "
 "Homepage. Sie werden per E-Mail ein neues Passwort erhalten."
 
+#. (path_cgi)
+#: ../web_tt2/help_faquser.tt2:15
+msgid ""
+"<strong>You have no password</strong>. To be given a password, follow the <a "
+"href=\"%1/firstpasswd\">First login?</a> link from the homepage. You will "
+"receive your new password by email."
+msgstr ""
+"<strong>Sie haben kein Passwort.</strong> Um ein Passwort zu erhalten, "
+"klicken Sie den Link <a href=\"%1/firstpasswd\">Erste Anmeldung?</a> auf der "
+"Homepage. Sie werden per E-Mail ein neues Passwort erhalten."
+
 #. (path_cgi)
 #: ../web_tt2/help_faquser.tt2:16
 msgid ""

po-wwsympa/en.po

@@ -4478,6 +4478,17 @@ msgstr ""
 "href=\"%1/sendpasswd\">First login?</a> link from the homepage. You will "
 "receive your new password by email."
 
+#. (path_cgi)
+#: ../web_tt2/help_faquser.tt2:15
+msgid ""
+"<strong>You have no password</strong>. To be given a password, follow the <a "
+"href=\"%1/firstpasswd\">First login?</a> link from the homepage. You will "
+"receive your new password by email."
+msgstr ""
+"<strong>You have no password</strong>. To be given a password, follow the <a "
+"href=\"%1/firstpasswd\">First login?</a> link from the homepage. You will "
+"receive your new password by email."
+
 #. (path_cgi)
 #: ../web_tt2/help_faquser.tt2:16
 msgid ""