diff --git a/Makefile b/Makefile
index 33003140..6596ded6 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ TEMPLATES=default april bxlug codelutin.org cuisine easter-eggs entrouvert.com e
 
 RPM_PACKAGE_NAME=python$(PYTHON_VERSION)-tal python$(PYTHON_VERSION)-imaging  python$(PYTHON_VERSION)-docutils
 
-.PHONY: help archive clean data-archive dist dist-clean install-create-dir install-glasnost install-data install-extensions install-gtk install-locale install-log install-python-libs install-scripts install-servers install-templates install-web install mo po glasnost.spec rpm rpm-depend uninstall config
+.PHONY: help archive clean data-archive dist dist-clean install-create-dir install-glasnost install-data install-extensions install-gtk install-locale install-log install-python-libs install-scripts install-servers install-templates install-web install mo po profiles-xml glasnost.spec rpm rpm-depend uninstall
 
 help:
 	@echo
@@ -196,13 +196,12 @@ infos-xml:
 	do \
 		intltool-merge -x po/glasnost-web/ $$F `dirname $$F`/`basename $$F .in`; \
 	done
-	
+
 install-create-dir:
 	-mkdir -p "$(DESTDIR)/$(BIN_DIR)"
 	-mkdir -p "$(DESTDIR)/$(DATA_DIR)"
 	-mkdir -p "$(DESTDIR)/$(GLASNOST_DIR)"
 	-mkdir -p "$(DESTDIR)/$(ETC_DIR)"
-	-mkdir -p "$(DESTDIR)/etc/init.d"
 	-mkdir -p "$(DESTDIR)/$(EXTENSIONS_DIR)"
 	-mkdir -p "$(DESTDIR)/$(LIBS_DIR)"
 	-mkdir -p "$(DESTDIR)/$(LOCALE_DIR)"
@@ -214,9 +213,9 @@ install-create-dir:
 	-mkdir -p "$(DESTDIR)/$(TEMPLATES_DIR)"
 	-mkdir -p "$(DESTDIR)/$(WEB_DIR)"
 
-install-glasnost:	config
+install-glasnost: config profiles-xml
 	@mkdir -p "$(DESTDIR)/$(GLASNOST_DIR)"
-	-cp $^ "$(DESTDIR)/$(GLASNOST_DIR)"/
+	-cp config "$(DESTDIR)/$(GLASNOST_DIR)"/
 	@if test -e "$(DESTDIR)/$(SBIN_DIR)/$(GLASNOST)"; then \
 		rm -f "$(DESTDIR)/$(SBIN_DIR)/$(GLASNOST)"; \
 	else :; fi
@@ -234,6 +233,8 @@ install-glasnost:	config
 	test ! -e "$(DESTDIR)/$(ETC_DIR)/config" || \
 		cp "$(DESTDIR)/$(ETC_DIR)/config" "$(DESTDIR)/$(ETC_DIR)/config.save"
 	test -e "$(DESTDIR)/$(ETC_DIR)/config" || cp config "$(DESTDIR)/$(ETC_DIR)/config"
+	test -d "$(DESTDIR)/$(ETC_DIR)/profiles" || mkdir "$(DESTDIR)/$(ETC_DIR)/profiles"
+	cp profiles/*.xml "$(DESTDIR)/$(ETC_DIR)/profiles"
 
 install-data:
 	@if ! test -e "$(DESTDIR)/$(DATA_DIR)"; then \
@@ -309,7 +310,7 @@ install-templates: infos-xml
 	-mkdir -p "$(DESTDIR)/$(TEMPLATES_DIR)"
 	for F in $(TEMPLATES); \
 	do \
-		(cd templates && tar c --exclude CVS --exclude '*.in' --exclude '*.in.h' $$F) | (cd "$(DESTDIR)/$(TEMPLATES_DIR)" && tar x); \
+		(cd templates && $(TAR) c --exclude CVS --exclude '*.in' --exclude '*.in.h' $$F) | (cd "$(DESTDIR)/$(TEMPLATES_DIR)" && $(TAR) x); \
 	done
 
 install-web:
@@ -356,6 +357,13 @@ mo:		po/glasnost-web/de.po \
 	msgfmt --statistics -c -v -o locale/fr/LC_MESSAGES/glasnost-web.mo po/glasnost-web/fr.po
 	msgfmt --statistics -c -v -o locale/sv/LC_MESSAGES/glasnost-web.mo po/glasnost-web/sv.po
 
+profiles-xml:
+	for F in `$(FIND) profiles/ -type f -name '*.xml.in'`; \
+	do \
+		intltool-merge -x po/glasnost-web/ $$F `dirname $$F`/`basename $$F .in`; \
+	done
+	
+	
 talTranslations.py: templates/
 	./talGettext.py templates/ > talTranslations.py
 
@@ -372,12 +380,12 @@ po:		glasnost-web/ \
 	cp po/glasnost-web/fi.po po/glasnost-web/fi.pox
 	cp po/glasnost-web/fr.po po/glasnost-web/fr.pox
 	cp po/glasnost-web/sv.po po/glasnost-web/sv.pox
-	for F in `$(FIND) templates/ -type f -name '*.xml.in'`; \
+	for F in `$(FIND) profiles/ templates/ -type f -name '*.xml.in'`; \
 	do \
 		intltool-extract --type=gettext/xml $$F; \
 	done
 	$(GETTEXT) -d po/glasnost-web/messages -k N_ `$(FIND) $^ -type f -name "*.py"` \
-			`$(FIND) templates/ -type f -name '*.xml.in.h'`
+			`$(FIND) profiles/ templates/ -type f -name '*.xml.in.h'`
 	msgmerge -o po/glasnost-web/de.po -D po/glasnost-web de.pox messages.pot
 	msgmerge -o po/glasnost-web/es.po -D po/glasnost-web es.pox messages.pot
 	msgmerge -o po/glasnost-web/fi.po -D po/glasnost-web fi.pox messages.pot
diff --git a/README.config b/README.config
index a331af25..bc2586d7 100644
--- a/README.config
+++ b/README.config
@@ -37,9 +37,6 @@ UseBalloonHelp = true
 # Cache files? (boolean, default: false)
 CacheFiles = false
 
-# Domains to use for translations going through gettext (don't change)
-GettextDomains = glasnost-web
-
 Per dispatcher options
 ----------------------
 
@@ -80,9 +77,6 @@ Debug:
 DisableSpellchecking:
     Disable spellchecking (used in <textarea> previews). (default: false)
 
-GettextDomains:
-    Allows to add more gettext domains to look in for translations.
-
 Profiling:
     Dumps profiling informations into /tmp/
     (default: false)
@@ -108,18 +102,10 @@ WebDirectoryPath:
     Define an additional path where to look for .py files after site
     DocumentRoot and before Glasnost-wide WebDirectoryPath.
 
-It is also possible to define custom modules to use for different server roles
-with:
-
-%(serverRole)s-web = ...
-
-Exemple: articles-web = lyonarticles
-
 
 Per server options
 ------------------
 
-OnlyForDispatchers
 ServerHostName
 ServerPort
 
diff --git a/debian/changelog b/debian/changelog
index c53cef6b..dccef8ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-glasnost (0.7.0.cvs-latestCVS.20031017.1) unstable; urgency=low
+glasnost (0.7.0.cvs-latestCVS.20031109.1) unstable; urgency=low
 
   * Built locally from CVS.
 
- -- Frederic Peters <fpeters@debian.org>  Fri, 17 Oct 2003 13:37:05 +0200
+ -- Frederic Peters <fpeters@debian.org>  Sun,  9 Nov 2003 13:48:30 +0100
 
 glasnost (0.6.5-1) unstable; urgency=low
 
diff --git a/glasnost-web/code/webhandler.py b/glasnost-web/code/webhandler.py
index 40727b78..bb272635 100644
--- a/glasnost-web/code/webhandler.py
+++ b/glasnost-web/code/webhandler.py
@@ -1106,13 +1106,8 @@ class Application(applications.Application):
         except locale.Error:
             locale.setlocale(locale.LC_COLLATE, 'C')
 
-        domains = [
-                commonTools.getConfig(
-                        virtualHost.hostName, 'GettextDomains', default = ''),
-                commonTools.getConfig('Misc', 'GettextDomains', default = ''),
-                '%s-web' % glasnost.applicationName ]
-        domains = ','.join([x for x in domains if x])
-        domains = [x.strip() for x in domains.split(',')]
+        domains = [ '%s-web' % glasnost.applicationName ] + (
+                    virtualHost.locales or [])
         translation = commonTools.translation(domains, languages)
         __builtin__.__dict__['_'] = translation.gettext
 
diff --git a/po/glasnost-web/de.po b/po/glasnost-web/de.po
index 40630da4..89e3e857 100644
--- a/po/glasnost-web/de.po
+++ b/po/glasnost-web/de.po
@@ -25,7 +25,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glasnost-web $Revision$\n"
-"POT-Creation-Date: Thu Nov  6 13:19:42 2003\n"
+"POT-Creation-Date: Tue Nov 18 16:12:53 2003\n"
 "PO-Revision-Date: 2002-08-22 18:43+0200\n"
 "Last-Translator: Odile Bénassy <obenassy@entrouvert.com>\n"
 "Language-Team: German <de@li.org>\n"
@@ -38,11 +38,11 @@ msgstr ""
 msgid "in3activa"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:249
+#: shared/common/VirtualHostsCommon.py:343
 msgid "Virtual Hosts"
 msgstr "Virtuelle Hosts"
 
-#: shared/common/kinds.py:1742
+#: shared/common/kinds.py:1704
 #, fuzzy
 msgid "Integer Choice"
 msgstr "Zur Auswahl von Wählern"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "New Translation"
 msgstr "Neue Übersetzung"
 
-#: shared/common/kinds.py:2585
+#: shared/common/kinds.py:2547
 msgid "Sequence"
 msgstr "Sequenz"
 
@@ -104,10 +104,10 @@ msgstr ""
 msgid "Secret Ballot"
 msgstr "Geheimne Wahl"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:249
+#: shared/common/CommentsCommon.py:86
 #, fuzzy
-msgid "Changing User Password"
-msgstr "Passwort wechseln"
+msgid "some comment"
+msgstr "Bemerkung"
 
 #: shared/common/ElectionsCommon.py:144
 msgid "Choose the persons or groups who will vote for this election."
@@ -118,7 +118,7 @@ msgstr ""
 msgid "Cyprus"
 msgstr "Zypern Pfund"
 
-#: shared/common/kinds.py:222 shared/common/kinds.py:3278
+#: shared/common/kinds.py:222 shared/common/kinds.py:3240
 msgid "Same As Edition Mode"
 msgstr ""
 
@@ -131,11 +131,11 @@ msgstr "November"
 msgid "Check Box"
 msgstr ""
 
-#: shared/common/kinds.py:2467
+#: shared/common/kinds.py:2429
 msgid "Execute On Submit"
 msgstr ""
 
-#: shared/common/kinds.py:3703
+#: shared/common/kinds.py:3665
 #, fuzzy
 msgid "User Token"
 msgstr "Marke des Wählers"
@@ -158,6 +158,11 @@ msgstr "Bearbeiten"
 msgid "New Heading"
 msgstr "Neue Rubrik"
 
+#: shared/web/AuthenticationLoginPasswordWeb.py:249
+#, fuzzy
+msgid "Changing User Password"
+msgstr "Passwort wechseln"
+
 #: shared/web/calendaring.py:60
 msgid "February"
 msgstr "Februar"
@@ -167,7 +172,7 @@ msgstr "Februar"
 msgid "Liberia"
 msgstr "Leu"
 
-#: shared/common/kinds.py:3253
+#: shared/common/kinds.py:3215
 #, fuzzy
 msgid "Structure"
 msgstr "Sucre"
@@ -177,7 +182,7 @@ msgid "Saint Kitts and Nevis"
 msgstr ""
 
 #: shared/common/AuthenticationLoginPasswordCommon.py:64
-#: shared/common/kinds.py:2355 shared/common/AuthenticationLdapCommon.py:63
+#: shared/common/kinds.py:2317 shared/common/AuthenticationLdapCommon.py:63
 #: shared/web/AuthenticationLoginPasswordWeb.py:69
 #: shared/web/AuthenticationLoginPasswordWeb.py:146
 msgid "Password"
@@ -224,13 +229,13 @@ msgstr ""
 msgid "Counting of the Votes"
 msgstr "Stimmenzählung"
 
-#: shared/common/kinds.py:2536
+#: shared/common/kinds.py:2498
 msgid "Script Source Code"
 msgstr ""
 
-#: shared/web/geography.py:65
-msgid "Burkina Faso"
-msgstr ""
+#: shared/web/VotesWeb.py:373
+msgid "Voter"
+msgstr "Wähler"
 
 #: shared/common/kinds.py:97
 #, fuzzy
@@ -298,11 +303,11 @@ msgstr "
 msgid "Add %s To Rubric"
 msgstr ""
 
-#: shared/web/GlasnostTALInterpreter.py:64
+#: shared/web/GlasnostTALInterpreter.py:67
 msgid "Error in generated HTML"
 msgstr ""
 
-#: shared/common/kinds.py:1749
+#: shared/common/kinds.py:1711
 #, fuzzy
 msgid "Select the language used to fill in this card."
 msgstr "Auswählen Sie den Kandidat zu hinzufügen"
@@ -392,11 +397,16 @@ msgstr "Zypern Pfund"
 msgid "files"
 msgstr "Dateien"
 
-#: shared/common/kinds.py:3980
+#: shared/common/kinds.py:3942
 #, fuzzy
 msgid "Widget Name"
 msgstr "Breite"
 
+#: shared/web/CommentsWeb.py:168
+#, fuzzy
+msgid "Add Comment"
+msgstr "Bemerkung"
+
 #: shared/web/TranslationsWeb.py:165 shared/web/TranslationsWeb.py:612
 #: shared/web/GradesWeb.py:85 shared/web/widgets.py:152
 #: shared/web/widgets.py:932 shared/web/widgets.py:938
@@ -427,15 +437,20 @@ msgstr "Benutzer :"
 msgid "Vote Blank"
 msgstr "leer wählen"
 
+#: profiles/basic.xml.in.h:1
+#, fuzzy
+msgid "Basic Functionalities"
+msgstr "Gesendeter Anruf"
+
 #: shared/web/AuthenticationLoginPasswordWeb.py:302
 #, fuzzy
 msgid "Delete Account"
 msgstr "Neues Konto"
 
-#: shared/common/faults.py:324 shared/common/faults.py:486
-#: shared/common/faults.py:494 shared/common/faults.py:502
-#: shared/common/faults.py:510 shared/common/faults.py:518
-#: shared/common/faults.py:526
+#: shared/common/faults.py:325 shared/common/faults.py:487
+#: shared/common/faults.py:495 shared/common/faults.py:503
+#: shared/common/faults.py:511 shared/common/faults.py:519
+#: shared/common/faults.py:527
 msgid "Value already used!"
 msgstr "Dieser Wert ist schon benutzt !"
 
@@ -451,11 +466,11 @@ msgstr ""
 msgid "Editing %s Settings"
 msgstr "%s Einstellungen bearbeiten"
 
-#: shared/web/geography.py:77
-msgid "Belarus"
+#: shared/web/geography.py:65
+msgid "Burkina Faso"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:344
+#: shared/web/AppointmentsWeb.py:346
 msgid "Week %d of %d"
 msgstr ""
 
@@ -478,7 +493,7 @@ msgstr "Datei System"
 msgid "Secret Ballots"
 msgstr "Geheimne Wahlen"
 
-#: shared/web/tools.py:574
+#: shared/web/tools.py:567
 msgid "Success"
 msgstr "Erfolg"
 
@@ -499,12 +514,12 @@ msgstr "Zweimal bestehender Wert !"
 msgid "Weightings"
 msgstr "Gewichtungen"
 
-#: shared/common/VirtualHostsCommon.py:147
+#: shared/common/VirtualHostsCommon.py:241
 #, fuzzy
 msgid "Enter the title of this virtual host."
 msgstr "Die letzte virtuellen Hosts"
 
-#: shared/common/VirtualHostsCommon.py:244
+#: shared/common/VirtualHostsCommon.py:338
 msgid "New Virtual Host"
 msgstr "Neuer virtuelle Host"
 
@@ -522,6 +537,11 @@ msgstr "Stimmenthaltung"
 msgid "Select the items to subtract."
 msgstr "Auswählen Sie den Kandidat zu hinzufügen"
 
+#: profiles/cards.xml.in.h:1
+#, fuzzy
+msgid "Cards Support"
+msgstr "Übersetzungsstatus"
+
 #: shared/common/xhtmlgenerator.py:107
 #, fuzzy
 msgid "Use"
@@ -601,15 +621,16 @@ msgstr "
 msgid "Read the License"
 msgstr "Die Lizenz lesen"
 
-#: shared/common/xhtmlgenerator.py:92
-msgid "Pester Absentionnists"
-msgstr "Stimmenthalter mahnen"
+#: shared/common/faults.py:558
+#, fuzzy
+msgid "Role not in profiles"
+msgstr "Durchgehende Wahl"
 
 #: shared/web/TranslationsWeb.py:550 shared/web/TranslationsWeb.py:564
 msgid "%(from)s to %(to)s"
 msgstr "%(from)s in %(to)s"
 
-#: shared/common/CommentsCommon.py:102 shared/web/UploadFilesWeb.py:71
+#: shared/common/CommentsCommon.py:104 shared/web/UploadFilesWeb.py:71
 #: shared/web/VotesWeb.py:335
 msgid "Comment"
 msgstr "Bemerkung"
@@ -626,12 +647,12 @@ msgstr ""
 msgid "History - %s"
 msgstr "Überblick - %s"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:439
+#: shared/web/AuthenticationLoginPasswordWeb.py:436
 #, fuzzy
 msgid "Create Account for user:"
 msgstr "Neues Konto"
 
-#: shared/common/kinds.py:3696
+#: shared/common/kinds.py:3658
 #, fuzzy
 msgid "Application Token"
 msgstr "Marke der Wahl"
@@ -641,7 +662,7 @@ msgstr "Marke der Wahl"
 msgid "Sweden"
 msgstr "Schwedisch"
 
-#: shared/common/kinds.py:3337
+#: shared/common/kinds.py:3299
 #, fuzzy
 msgid "Thing"
 msgstr "Rubrik"
@@ -660,7 +681,7 @@ msgstr ""
 msgid "Translatable"
 msgstr "Übersetzen"
 
-#: shared/common/kinds.py:3635 shared/common/kinds.py:3639
+#: shared/common/kinds.py:3597 shared/common/kinds.py:3601
 msgid "Creation Time"
 msgstr "Schaffungsdatum"
 
@@ -683,7 +704,7 @@ msgstr "Saudi Riyal"
 msgid "Intersection"
 msgstr "Übersetzungen"
 
-#: shared/common/kinds.py:3680
+#: shared/common/kinds.py:3642
 #, fuzzy
 msgid "Token"
 msgstr "Marke der Wahl"
@@ -716,7 +737,7 @@ msgstr "Mime Type"
 msgid "All Objects"
 msgstr "Alle Objekte"
 
-#: shared/common/kinds.py:2346
+#: shared/common/kinds.py:2308
 #, fuzzy
 msgid "Enter Twice"
 msgstr "Zur Auswahl von Wählern"
@@ -726,7 +747,7 @@ msgstr "Zur Auswahl von W
 msgid "Theridion"
 msgstr "Fassung :"
 
-#: shared/common/faults.py:475
+#: shared/common/faults.py:476
 #, fuzzy
 msgid "Winners group is not empty!"
 msgstr "Gruppe von Siegern"
@@ -749,7 +770,7 @@ msgstr "Mai"
 msgid "Current Password"
 msgstr "Passwort wechseln"
 
-#: shared/web/kinds.py:425
+#: shared/web/kinds.py:418
 #, fuzzy
 msgid "Default Values"
 msgstr "Gruppe in Abwesenheit"
@@ -786,7 +807,7 @@ msgid ""
 "document as you usually do."
 msgstr ""
 
-#: shared/common/kinds.py:2580
+#: shared/common/kinds.py:2542
 msgid "Minimum Number of Items"
 msgstr ""
 
@@ -795,8 +816,8 @@ msgstr ""
 msgid "Saint Lucia"
 msgstr "Syrisches Pfund"
 
-#: shared/common/faults.py:264 shared/common/faults.py:272
-#: shared/common/faults.py:347
+#: shared/common/faults.py:265 shared/common/faults.py:273
+#: shared/common/faults.py:348
 msgid "Wrong value!"
 msgstr "Falscher Wert !"
 
@@ -828,7 +849,7 @@ msgstr "GnuPG Fingerabdruck"
 msgid "Find"
 msgstr "Suchen"
 
-#: shared/web/ObjectsWeb.py:364 shared/web/VotesWeb.py:755
+#: shared/web/ObjectsWeb.py:368 shared/web/VotesWeb.py:755
 #: shared/web/modes.py:257
 msgid "Editing %s - %s"
 msgstr "Bearbeitung von %s - %s"
@@ -838,7 +859,7 @@ msgstr "Bearbeitung von %s - %s"
 msgid "All Label"
 msgstr "Etikett"
 
-#: shared/web/tools.py:488
+#: shared/web/tools.py:431 shared/web/tools.py:481
 msgid "(missing item)"
 msgstr ""
 
@@ -859,12 +880,15 @@ msgstr ""
 msgid "Viet Nam"
 msgstr "Breite"
 
-#: shared/common/CommentsCommon.py:78
-#, fuzzy
-msgid "Enter the title of your comment."
-msgstr "Die letzte virtuellen Hosts"
+#: shared/web/geography.py:194
+msgid "Romania"
+msgstr ""
 
-#: shared/common/kinds.py:1557 shared/common/kinds.py:3809
+#: shared/web/ElectionsWeb.py:368
+msgid "blank vote"
+msgstr "leere Stimmabgabe"
+
+#: shared/common/kinds.py:1519 shared/common/kinds.py:3771
 #: shared/web/BrevesWeb.py:71
 msgid "Links"
 msgstr "Bindungen"
@@ -883,7 +907,7 @@ msgstr "OK"
 msgid "DIV With Label"
 msgstr "Etikett"
 
-#: shared/common/kinds.py:3955
+#: shared/common/kinds.py:3917
 msgid "Value Holder"
 msgstr ""
 
@@ -891,7 +915,7 @@ msgstr ""
 msgid "Jamaica"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:98
+#: shared/common/VirtualHostsCommon.py:158
 msgid "Enter the host name."
 msgstr ""
 
@@ -904,13 +928,12 @@ msgstr "Streichen"
 msgid "New Zealand"
 msgstr "Neuseeland Dollar"
 
-#: shared/common/kinds.py:2484
+#: shared/common/kinds.py:2446
 msgid "Script"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:398
+#: shared/common/xhtmlgenerator.py:401
 #: shared/web/AuthenticationLoginPasswordWeb.py:384
-#: shared/web/AuthenticationLoginPasswordWeb.py:431
 msgid "Missing Object (%s)"
 msgstr ""
 
@@ -962,7 +985,7 @@ msgstr ""
 msgid "Congo, the Democratic Republic of the"
 msgstr ""
 
-#: shared/web/CommentsWeb.py:105
+#: shared/web/CommentsWeb.py:106
 msgid "Anonymous"
 msgstr ""
 
@@ -971,7 +994,7 @@ msgstr ""
 msgid "New Election"
 msgstr "Wahl"
 
-#: shared/common/kinds.py:1678
+#: shared/common/kinds.py:1640
 msgid "Minimum Value"
 msgstr ""
 
@@ -1001,12 +1024,17 @@ msgstr "Hinzuf
 msgid "Tonga"
 msgstr "Dong"
 
+#: profiles/comments.xml.in.h:1
+#, fuzzy
+msgid "Comments Support"
+msgstr "Übersetzungsstatus"
+
 #: shared/web/ArticlesWeb.py:283
 msgid "DocBook Source - %s"
 msgstr "DocBook Quelle - %s"
 
 #: shared/web/AuthenticationLoginPasswordWeb.py:359
-#: shared/web/AuthenticationLoginPasswordWeb.py:518
+#: shared/web/AuthenticationLoginPasswordWeb.py:515
 #, fuzzy
 msgid "The password has been sent successfully."
 msgstr "Das Passwort wurde per Email zu %s gesendet!"
@@ -1019,7 +1047,7 @@ msgstr "Zur Einsch
 msgid "Analyze"
 msgstr "Analyse"
 
-#: shared/common/VirtualHostsCommon.py:56
+#: shared/common/VirtualHostsCommon.py:58
 #, fuzzy
 msgid "Select the default virtual host to use on this server"
 msgstr "Die zu verwalten letzte virtuellen Hosts"
@@ -1044,11 +1072,11 @@ msgstr ""
 msgid "New Implementation"
 msgstr "Neue Operation"
 
-#: shared/common/faults.py:248
+#: shared/common/faults.py:249
 msgid "Specified path is not a file!"
 msgstr "Der spezifierte Zugangsweg erzielt keine Datei !"
 
-#: shared/common/kinds.py:2798
+#: shared/common/kinds.py:2760
 #, fuzzy
 msgid "Choose the user(s) of this object."
 msgstr "Stimmabgabe auf vollendeten Wahlen"
@@ -1138,7 +1166,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: shared/common/kinds.py:1687
+#: shared/common/kinds.py:1649
 msgid "Integer Number"
 msgstr "Ganzzahl"
 
@@ -1183,7 +1211,7 @@ msgstr ""
 msgid "Member of groups"
 msgstr "Mitglieder"
 
-#: shared/common/kinds.py:3119
+#: shared/common/kinds.py:3081
 msgid "Server Role"
 msgstr ""
 
@@ -1192,15 +1220,15 @@ msgstr ""
 msgid "The account and the user card have been removed successfully."
 msgstr "Das Passwort wurde per Email zu %s gesendet!"
 
-#: shared/common/VirtualHostsCommon.py:84
+#: shared/common/VirtualHostsCommon.py:144
 msgid ""
 "Enter the Glasnost dispatcher id for this virtual host (you may have to "
 "consult your administrator)."
 msgstr ""
 
-#: shared/web/ElectionsWeb.py:368
-msgid "blank vote"
-msgstr "leere Stimmabgabe"
+#: templates/pel-infini/infos.xml.in.h:1
+msgid "infini (assoc brest)"
+msgstr ""
 
 #: shared/web/geography.py:166
 #, fuzzy
@@ -1272,11 +1300,6 @@ msgstr ""
 msgid "Israel"
 msgstr ""
 
-#: shared/web/geography.py:228
-#, fuzzy
-msgid "Uganda"
-msgstr "Rand"
-
 #: shared/web/ElectionsWeb.py:350 shared/web/ElectionsWeb.py:366
 msgid "secret"
 msgstr "geheim"
@@ -1422,7 +1445,7 @@ msgstr "Gruppe in Abwesenheit"
 msgid "Nicaragua"
 msgstr ""
 
-#: shared/web/UploadFilesWeb.py:352
+#: shared/web/UploadFilesWeb.py:355
 msgid "Your last files"
 msgstr "Ihre letzte Dateien"
 
@@ -1440,7 +1463,7 @@ msgstr "Januar"
 msgid "Public Ballot"
 msgstr "Öffentlicher Wahlzettel"
 
-#: shared/web/ObjectsWeb.py:652
+#: shared/web/ObjectsWeb.py:660
 msgid "Id for \"%s\""
 msgstr ""
 
@@ -1448,7 +1471,7 @@ msgstr ""
 msgid "Heading"
 msgstr "Rubrik"
 
-#: shared/common/kinds.py:3161
+#: shared/common/kinds.py:3123
 #, fuzzy
 msgid "Slot Name"
 msgstr "Vorname"
@@ -1458,7 +1481,7 @@ msgstr "Vorname"
 msgid "New Alias"
 msgstr "Neues %s"
 
-#: shared/common/kinds.py:3793
+#: shared/common/kinds.py:3755
 #, fuzzy
 msgid "Action"
 msgstr "Wahl"
@@ -1480,7 +1503,7 @@ msgstr "Neues %s"
 msgid "Reverse Year Order?"
 msgstr ""
 
-#: shared/common/kinds.py:2741
+#: shared/common/kinds.py:2703
 msgid "Accepted Types"
 msgstr ""
 
@@ -1521,16 +1544,20 @@ msgstr "Georgischer Lari"
 msgid "Definition"
 msgstr "Sicher"
 
+#: profiles/ldap.xml.in.h:1
+msgid "LDAP Support"
+msgstr ""
+
 #: shared/common/CardsCommon.py:607
 msgid "Card"
 msgstr "Karte"
 
-#: shared/common/kinds.py:2852 shared/common/kinds.py:2858
+#: shared/common/kinds.py:2814 shared/common/kinds.py:2820
 #, fuzzy
 msgid "Properties"
 msgstr "Operationen"
 
-#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:365
+#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:368
 #: talTranslations.py:6
 msgid "Files"
 msgstr "Dateien"
@@ -1585,9 +1612,9 @@ msgstr "Argentinischer Peso"
 msgid "Appointment"
 msgstr "Inhalt"
 
-#: shared/web/TranslationsWeb.py:125
-msgid "From "
-msgstr "Von "
+#: shared/web/ElectionsWeb.py:70
+msgid "Kind of Ballots"
+msgstr "Stimmzettel Typ"
 
 #: shared/web/TranslationsWeb.py:232
 msgid "Sources"
@@ -1628,10 +1655,6 @@ msgstr "Die letzte Zeichenketten zur 
 msgid "Luxembourg"
 msgstr ""
 
-#: shared/web/geography.py:179
-msgid "Norway"
-msgstr ""
-
 #: shared/common/BrevesCommon.py:199
 #, fuzzy
 msgid "New Short Article"
@@ -1660,7 +1683,7 @@ msgstr ""
 msgid "Exclusive Choice"
 msgstr "Zur Auswahl von Wählern"
 
-#: shared/common/CommentsCommon.py:101 shared/web/ElectionsWeb.py:316
+#: shared/common/CommentsCommon.py:103 shared/web/ElectionsWeb.py:316
 msgid "comment"
 msgstr "Bemerkung"
 
@@ -1693,7 +1716,7 @@ msgstr "Titel"
 msgid "Malaysia"
 msgstr "Maltesische Lira"
 
-#: shared/web/AppointmentsWeb.py:677 shared/web/widgets.py:612
+#: shared/web/AppointmentsWeb.py:680 shared/web/widgets.py:612
 msgid "Month"
 msgstr "Monat"
 
@@ -1709,7 +1732,7 @@ msgstr ""
 msgid "The last system files to administer"
 msgstr "Die zu verwalten letzte System Dateien"
 
-#: shared/common/faults.py:549
+#: shared/common/faults.py:550
 msgid "Value too big!"
 msgstr "Zu grosser Wert !"
 
@@ -1723,6 +1746,11 @@ msgstr ""
 "Kandidaten.</p><p>Der Kandidat \"<i>%(candidate)s</i>\" erzielt den Wahlsieg."
 "</p>"
 
+#: shared/common/CommentsCommon.py:75
+#, fuzzy
+msgid "Editorial Comment ?"
+msgstr "Bemerkung"
+
 #: shared/common/ArticlesCommon.py:145
 msgid "article"
 msgstr "Artikel"
@@ -1735,14 +1763,15 @@ msgstr ""
 msgid "Choose whether to crypt e-mails Glasnost sends to you."
 msgstr ""
 
-#: shared/common/kinds.py:1839
+#: shared/common/kinds.py:1801
 #, fuzzy
 msgid "Mapping"
 msgstr "Quote"
 
-#: templates/linuxdays/infos.xml.in.h:1
-msgid "Luxembourg LinuxDays"
-msgstr ""
+#: shared/common/VirtualHostsCommon.py:174
+#, fuzzy
+msgid "Usage Profiles"
+msgstr "System Dateien"
 
 #: shared/web/geography.py:165
 msgid "Mongolia"
@@ -1812,7 +1841,7 @@ msgstr "Mitglieder"
 msgid "Version Number"
 msgstr "Fassung :"
 
-#: shared/web/AppointmentsWeb.py:91
+#: shared/web/AppointmentsWeb.py:93
 msgid "Select the people and groups who are assigned to this appointment."
 msgstr ""
 
@@ -1844,6 +1873,14 @@ msgstr ""
 msgid "Table with One-on-One comparisons of the candidates"
 msgstr ""
 
+#: glasnost-web/siteMap.py:69
+msgid "Site Map"
+msgstr ""
+
+#: shared/common/xhtmlgenerator.py:62
+msgid "Abstain"
+msgstr "Stimmenthaltung"
+
 #: shared/web/TranslationsWeb.py:208
 msgid "Good"
 msgstr "Gut"
@@ -1908,7 +1945,7 @@ msgstr "Update 
 msgid "Your elections being written"
 msgstr "Ihre Wahlen in Bearbeitung"
 
-#: shared/web/AppointmentsWeb.py:210
+#: shared/web/AppointmentsWeb.py:212
 #, fuzzy
 msgid "Future events"
 msgstr "Ereignisse"
@@ -2001,7 +2038,7 @@ msgstr "Tag"
 msgid "Monaco"
 msgstr "Fühlung"
 
-#: shared/common/kinds.py:3811
+#: shared/common/kinds.py:3773
 #, fuzzy
 msgid "Push Button"
 msgstr "Veröffentlichung"
@@ -2032,7 +2069,7 @@ msgstr "Bearbeitung der Bevorzugungen"
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: shared/common/kinds.py:2747
+#: shared/common/kinds.py:2709
 msgid "Accepted Roles"
 msgstr ""
 
@@ -2055,7 +2092,7 @@ msgstr "Yuan"
 msgid "Argentina"
 msgstr "Argentinischer Peso"
 
-#: shared/common/kinds.py:3781
+#: shared/common/kinds.py:3743
 #, fuzzy
 msgid "Extended Choice"
 msgstr "Zur Auswahl von Wählern"
@@ -2075,7 +2112,7 @@ msgstr ""
 msgid "Others"
 msgstr "Oktober"
 
-#: shared/web/AppointmentsWeb.py:635
+#: shared/web/AppointmentsWeb.py:638
 #, fuzzy
 msgid "Hour: %s - %s"
 msgstr "%s - %s"
@@ -2084,7 +2121,7 @@ msgstr "%s - %s"
 msgid "Cuba"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:103
+#: shared/common/CommentsCommon.py:105
 #, fuzzy
 msgid "comments"
 msgstr "Bemerkung"
@@ -2118,7 +2155,7 @@ msgstr "Marke der Wahl"
 msgid "Subject for the \"welcome\" email."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:775
+#: shared/web/ObjectsWeb.py:783
 #, fuzzy
 msgid "Search Results"
 msgstr "Wahlergebnisse"
@@ -2144,7 +2181,7 @@ msgstr ""
 msgid "Other Translations"
 msgstr "Andere Übersetzungen"
 
-#: shared/common/VirtualHostsCommon.py:124
+#: shared/common/VirtualHostsCommon.py:218
 msgid "Template"
 msgstr "Schablone"
 
@@ -2171,8 +2208,7 @@ msgstr "Breite"
 msgid "Malta"
 msgstr "Daten"
 
-#: shared/common/CommentsCommon.py:104 shared/web/ObjectsWeb.py:1206
-#: shared/web/ObjectsWeb.py:1222
+#: shared/common/CommentsCommon.py:106 shared/web/CommentsWeb.py:163
 #, fuzzy
 msgid "Comments"
 msgstr "Bemerkung"
@@ -2181,7 +2217,7 @@ msgstr "Bemerkung"
 msgid "Registered Voters:"
 msgstr "Stimmberechtigte Wähler :"
 
-#: shared/common/kinds.py:3578 shared/web/GroupsWeb.py:88
+#: shared/common/kinds.py:3540 shared/web/GroupsWeb.py:88
 #, fuzzy
 msgid "Union"
 msgstr "Unbekannt"
@@ -2202,7 +2238,7 @@ msgstr "System Dateien"
 msgid "Select the author(s) of the document."
 msgstr ""
 
-#: shared/common/kinds.py:2816
+#: shared/common/kinds.py:2778
 #, fuzzy
 msgid "People Set"
 msgstr "Personen"
@@ -2264,13 +2300,19 @@ msgstr "Benutzer :"
 msgid "Egypt"
 msgstr ""
 
+#: profiles/translations.xml.in.h:1
+#, fuzzy
+msgid "Translations Support"
+msgstr "Übersetzungsstatus"
+
 #: shared/web/geography.py:121
 msgid "Honduras"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:62
-msgid "Abstain"
-msgstr "Stimmenthaltung"
+#: shared/web/AuthenticationLoginPasswordWeb.py:513
+#, fuzzy
+msgid "An error occured while sending the password."
+msgstr "Emailaddresse"
 
 #: shared/common/translation.py:66
 msgid "Portuguese"
@@ -2280,21 +2322,17 @@ msgstr "Portugiesisch"
 msgid "The last system files"
 msgstr "Die letzte System Dateien"
 
-#: templates/pel-infini/infos.xml.in.h:1
-msgid "infini (assoc brest)"
-msgstr ""
-
 #: shared/web/PreferencesWeb.py:70
 msgid "Crypt Emails"
 msgstr "Emails verschlüsseln"
 
 #: shared/common/xhtmlgenerator.py:85
-#: shared/web/AuthenticationLoginPasswordWeb.py:496
+#: shared/web/AuthenticationLoginPasswordWeb.py:493
 #: shared/web/AuthenticationLdapWeb.py:124 talTranslations.py:14
 msgid "Login"
 msgstr "Benutzerkennung"
 
-#: shared/common/faults.py:225
+#: shared/common/faults.py:226
 #, fuzzy
 msgid "Invalid email address"
 msgstr "Emailaddresse"
@@ -2304,7 +2342,7 @@ msgstr "Emailaddresse"
 msgid "Guyana"
 msgstr "Guarani"
 
-#: shared/common/kinds.py:3909 shared/common/modes.py:188
+#: shared/common/kinds.py:3871 shared/common/modes.py:188
 #, fuzzy
 msgid "Mode"
 msgstr "Marke des Wählers"
@@ -2335,7 +2373,7 @@ msgstr "Objekt"
 msgid "Button"
 msgstr "Veröffentlichung"
 
-#: shared/common/kinds.py:3826
+#: shared/common/kinds.py:3788
 #, fuzzy
 msgid "Fault"
 msgstr "Misserfolg"
@@ -2378,7 +2416,7 @@ msgstr ""
 msgid "View Aspect"
 msgstr "Gleichheit"
 
-#: shared/web/UploadFilesWeb.py:359
+#: shared/web/UploadFilesWeb.py:362
 msgid "The last files"
 msgstr "Die letzte Dateien"
 
@@ -2397,7 +2435,7 @@ msgstr ""
 msgid "Germany"
 msgstr "Deutsch"
 
-#: shared/common/VirtualHostsCommon.py:121
+#: shared/common/VirtualHostsCommon.py:215
 msgid "Select the template (skin) to use for this host."
 msgstr ""
 
@@ -2424,7 +2462,7 @@ msgstr "Einstellungen"
 msgid "April"
 msgstr "April"
 
-#: shared/common/kinds.py:2812 shared/common/kinds.py:2818
+#: shared/common/kinds.py:2774 shared/common/kinds.py:2780
 #, fuzzy
 msgid "Users"
 msgstr "Benutzer :"
@@ -2462,7 +2500,7 @@ msgstr ""
 msgid "headings"
 msgstr "Rubriken"
 
-#: shared/common/kinds.py:3771 shared/common/kinds.py:3773
+#: shared/common/kinds.py:3733 shared/common/kinds.py:3735
 msgid "Writers"
 msgstr "Bearbeiter"
 
@@ -2489,7 +2527,7 @@ msgstr "Wahl"
 msgid "Winners Grading"
 msgstr "Reihenfolge von Siegern"
 
-#: shared/common/kinds.py:3314
+#: shared/common/kinds.py:3276
 #, fuzzy
 msgid "Access in View Mode"
 msgstr "Bearbeitungsdatum"
@@ -2560,7 +2598,7 @@ msgstr "Leser"
 msgid "Header 6"
 msgstr "Leser"
 
-#: shared/common/faults.py:362
+#: shared/common/faults.py:363
 msgid "Missing value!"
 msgstr "Abwesender Wert !"
 
@@ -2587,6 +2625,10 @@ msgstr "Kurznachricht"
 msgid "Enter the text of your comment."
 msgstr "Die letzte virtuellen Hosts"
 
+#: templates/linuxdays/infos.xml.in.h:1
+msgid "Luxembourg LinuxDays"
+msgstr ""
+
 #: shared/web/geography.py:226
 msgid "Tanzania, United Republic of"
 msgstr ""
@@ -2620,7 +2662,7 @@ msgstr ""
 msgid "Are you sure you want to delete the %s \"%s\" ?"
 msgstr "Wollen Sie sicher den Zettel streichen?"
 
-#: shared/common/kinds.py:3764
+#: shared/common/kinds.py:3726
 msgid "Select the people and groups who are allowed to modify the item."
 msgstr ""
 
@@ -2646,7 +2688,7 @@ msgstr ""
 msgid "Gambia"
 msgstr ""
 
-#: shared/common/kinds.py:1755 shared/common/kinds.py:1763
+#: shared/common/kinds.py:1717 shared/common/kinds.py:1725
 msgid "Language"
 msgstr "Sprache"
 
@@ -2668,9 +2710,9 @@ msgstr ""
 msgid "Blank Ballots:"
 msgstr "Leere Wahl:"
 
-#: shared/common/kinds.py:1103 shared/common/kinds.py:1761
-#: shared/common/kinds.py:2482 shared/common/kinds.py:2583
-#: shared/common/kinds.py:3945
+#: shared/common/kinds.py:1103 shared/common/kinds.py:1723
+#: shared/common/kinds.py:2444 shared/common/kinds.py:2545
+#: shared/common/kinds.py:3907
 #, fuzzy
 msgid "Data"
 msgstr "Datum"
@@ -2688,7 +2730,7 @@ msgid "Ties"
 msgstr "Gleichheit"
 
 #: shared/common/kinds.py:1315 shared/common/widgets.py:207
-#: shared/web/AppointmentsWeb.py:204 shared/web/AppointmentsWeb.py:216
+#: shared/web/AppointmentsWeb.py:206 shared/web/AppointmentsWeb.py:218
 #: shared/web/ArticlesWeb.py:323
 msgid "Date"
 msgstr "Datum"
@@ -2723,7 +2765,7 @@ msgstr "Konto"
 msgid "Editing Translation"
 msgstr "Bearbeitung der Übersetzung"
 
-#: shared/common/kinds.py:3800
+#: shared/common/kinds.py:3762
 #, fuzzy
 msgid "Next Mode"
 msgstr "Marke des Wählers"
@@ -2759,12 +2801,12 @@ msgid ""
 "Please backup your changes and redo the edition."
 msgstr ""
 
-#: shared/common/CommentsCommon.py:99
+#: shared/common/CommentsCommon.py:101
 #, fuzzy
 msgid "New Comment"
 msgstr "Neue Bemerkung"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:469
+#: shared/web/AuthenticationLoginPasswordWeb.py:466
 #: shared/web/AuthenticationLdapWeb.py:99
 msgid "To access this part of the site, you need to sign in."
 msgstr ""
@@ -2778,12 +2820,12 @@ msgstr "Einstellungen der Browser benutzen"
 msgid "xOctober"
 msgstr "Oktober"
 
-#: shared/web/AppointmentsWeb.py:93
+#: shared/web/AppointmentsWeb.py:95
 #, fuzzy
 msgid "Participants"
 msgstr "Artikel"
 
-#: shared/web/AppointmentsWeb.py:95
+#: shared/web/AppointmentsWeb.py:97
 #, fuzzy
 msgid "Start"
 msgstr "Zustand"
@@ -2801,9 +2843,9 @@ msgstr "Bearbeitungsdatum"
 msgid "Dominica"
 msgstr ""
 
-#: shared/web/VotesWeb.py:373
-msgid "Voter"
-msgstr "Wähler"
+#: shared/web/TranslationsWeb.py:125
+msgid "From "
+msgstr "Von "
 
 #: shared/common/VotesCommon.py:372 shared/web/ElectionsWeb.py:284
 #: shared/web/VotesWeb.py:914
@@ -2818,7 +2860,7 @@ msgstr ""
 msgid "(%d words)"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:238
+#: shared/web/AppointmentsWeb.py:240
 #, fuzzy
 msgid "Day long appointments"
 msgstr "Inhalt"
@@ -2841,10 +2883,10 @@ msgstr ""
 msgid "Minimum Year Value Difference to Now"
 msgstr ""
 
-#: shared/common/kinds.py:3805
+#: shared/web/geography.py:228
 #, fuzzy
-msgid "Next Object"
-msgstr "Neues Objekt"
+msgid "Uganda"
+msgstr "Rand"
 
 #: shared/common/RubricsCommon.py:114
 msgid "Headings"
@@ -2858,7 +2900,7 @@ msgstr ""
 msgid "Currency"
 msgstr "Währung"
 
-#: shared/common/kinds.py:2573
+#: shared/common/kinds.py:2535
 #, fuzzy
 msgid "Item Type"
 msgstr "Mime Type"
@@ -2888,7 +2930,7 @@ msgstr "Personen"
 msgid "Chad"
 msgstr "Haben"
 
-#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:90
+#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:150
 #, fuzzy
 msgid "Glasnost Dispatcher ID"
 msgstr "Glasnost Id"
@@ -2969,12 +3011,12 @@ msgstr "Durch Email Senden"
 msgid "Bolivia"
 msgstr "Boulga"
 
-#: shared/common/xhtmlgenerator.py:248 shared/common/widgets.py:154
+#: shared/common/xhtmlgenerator.py:251 shared/common/widgets.py:154
 #: shared/common/widgets.py:358 shared/web/widgets.py:506
 msgid "None"
 msgstr "Kein"
 
-#: shared/common/kinds.py:2472
+#: shared/common/kinds.py:2434
 #, fuzzy
 msgid "Source Code"
 msgstr "Quelle sehen"
@@ -3018,7 +3060,7 @@ msgid ""
 "be displayed."
 msgstr ""
 
-#: shared/common/faults.py:541
+#: shared/common/faults.py:542
 msgid "Value too small!"
 msgstr "Der Wert ist zu klein!"
 
@@ -3026,6 +3068,10 @@ msgstr "Der Wert ist zu klein!"
 msgid "Link Entry Field"
 msgstr ""
 
+#: profiles/cms.xml.in.h:1
+msgid "Content Management System"
+msgstr ""
+
 #: shared/web/geography.py:178
 msgid "Netherlands"
 msgstr ""
@@ -3043,13 +3089,8 @@ msgstr ""
 msgid "Evaluate"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:516
-#, fuzzy
-msgid "An error occured while sending the password."
-msgstr "Emailaddresse"
-
-#: shared/web/geography.py:194
-msgid "Romania"
+#: shared/web/geography.py:77
+msgid "Belarus"
 msgstr ""
 
 #: shared/web/geography.py:176
@@ -3071,7 +3112,7 @@ msgstr "Username"
 msgid "Benin"
 msgstr ""
 
-#: shared/common/kinds.py:2373
+#: shared/common/kinds.py:2335
 msgid "Python Identifier"
 msgstr ""
 
@@ -3141,11 +3182,11 @@ msgstr ""
 msgid "Multi-Line Field"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:247
+#: shared/common/VirtualHostsCommon.py:341
 msgid "Virtual Host"
 msgstr "Vitueller Host"
 
-#: shared/web/AppointmentsWeb.py:88
+#: shared/web/AppointmentsWeb.py:90
 #, fuzzy
 msgid "End"
 msgstr "Vollendet"
@@ -3177,11 +3218,6 @@ msgstr ""
 msgid "Kenya"
 msgstr "Kuna"
 
-#: shared/common/kinds.py:1517
-#, fuzzy
-msgid "Function Name"
-msgstr "Vorname"
-
 #: shared/web/geography.py:152
 msgid "Lesotho"
 msgstr ""
@@ -3194,7 +3230,7 @@ msgstr ""
 msgid "Best Average"
 msgstr "Besserer Durchschnitt"
 
-#: shared/common/kinds.py:3865
+#: shared/common/kinds.py:3827
 #, fuzzy
 msgid "Kind Name"
 msgstr "Vorname"
@@ -3218,7 +3254,7 @@ msgid ""
 "items."
 msgstr ""
 
-#: shared/common/BrevesCommon.py:204 shared/web/tools.py:627
+#: shared/common/BrevesCommon.py:204 shared/web/tools.py:616
 #: shared/web/BrevesWeb.py:168 talTranslations.py:17
 msgid "Short News"
 msgstr "Neuer Kurznachricht"
@@ -3250,7 +3286,7 @@ msgstr ""
 msgid "The election \"%s\""
 msgstr "Die Wahl \"%s\""
 
-#: shared/web/AppointmentsWeb.py:225 shared/web/AppointmentsWeb.py:683
+#: shared/web/AppointmentsWeb.py:227 shared/web/AppointmentsWeb.py:686
 #, fuzzy
 msgid "Agenda"
 msgstr "Algerischer Dinar"
@@ -3372,7 +3408,7 @@ msgstr ""
 msgid "Authentication (LDAP)"
 msgstr "Stimmenthaltung"
 
-#: shared/common/VirtualHostsCommon.py:248
+#: shared/common/VirtualHostsCommon.py:342
 msgid "virtual hosts"
 msgstr "virtuellen Hosts"
 
@@ -3380,7 +3416,7 @@ msgstr "virtuellen Hosts"
 msgid "group"
 msgstr "Gruppe"
 
-#: shared/common/kinds.py:436 shared/common/kinds.py:3966
+#: shared/common/kinds.py:436 shared/common/kinds.py:3928
 #: shared/common/xhtmlgenerator.py:114 shared/common/modes.py:141
 #: shared/common/widgets.py:80 shared/common/widgets.py:84
 #, fuzzy
@@ -3396,7 +3432,7 @@ msgstr "Rang"
 msgid "New Forum"
 msgstr "Neues Atom"
 
-#: shared/web/AppointmentsWeb.py:57
+#: shared/web/AppointmentsWeb.py:59
 #, fuzzy
 msgid "Categories Group"
 msgstr "Gruppe von Siegern"
@@ -3456,7 +3492,7 @@ msgstr ""
 msgid "Author"
 msgstr "Verfasser"
 
-#: shared/common/VirtualHostsCommon.py:246
+#: shared/common/VirtualHostsCommon.py:340
 msgid "virtual host"
 msgstr "virtueller Host"
 
@@ -3469,7 +3505,7 @@ msgstr "Emailaddresse"
 msgid "Sao Tome and Principe"
 msgstr ""
 
-#: shared/common/kinds.py:2826
+#: shared/common/kinds.py:2788
 msgid "Choose the author(s) for this object."
 msgstr ""
 
@@ -3481,12 +3517,17 @@ msgstr "Anwenden"
 msgid "Public Ballots"
 msgstr "Öffentliche Stimmzettel"
 
-#: shared/common/kinds.py:3946 shared/common/UploadFilesCommon.py:135
+#: shared/common/kinds.py:3908 shared/common/UploadFilesCommon.py:135
 #: shared/common/uploads.py:74 shared/web/UploadFilesWeb.py:77
 #: shared/web/uploads.py:67
 msgid "File"
 msgstr "Datei"
 
+#: shared/common/kinds.py:3812 shared/common/values.py:53
+#, fuzzy
+msgid "Kind"
+msgstr "Suchen"
+
 #: shared/common/kinds.py:1267 shared/common/kinds.py:1269
 #, fuzzy
 msgid "Date & Time"
@@ -3500,7 +3541,7 @@ msgstr "Vollendet"
 msgid "Enter the name of this heading."
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:678 shared/web/widgets.py:598
+#: shared/web/AppointmentsWeb.py:681 shared/web/widgets.py:598
 msgid "Year"
 msgstr "Jahr"
 
@@ -3510,7 +3551,7 @@ msgstr "Wahlergebnisse"
 
 #: shared/common/xhtmlgenerator.py:90
 #: shared/web/AuthenticationLoginPasswordWeb.py:371
-#: shared/web/AuthenticationLoginPasswordWeb.py:576
+#: shared/web/AuthenticationLoginPasswordWeb.py:573
 msgid "New Account"
 msgstr "Neues Konto"
 
@@ -3567,7 +3608,7 @@ msgstr ""
 msgid "Alias"
 msgstr ""
 
-#: shared/common/kinds.py:3276
+#: shared/common/kinds.py:3238
 #, fuzzy
 msgid "Access in Creation Mode"
 msgstr "Schaffungsdatum"
@@ -3595,7 +3636,7 @@ msgstr "Misserfolg"
 msgid "Eritrea"
 msgstr "Bearbeiter"
 
-#: shared/common/kinds.py:2462
+#: shared/common/kinds.py:2424
 msgid "Execute On Display"
 msgstr ""
 
@@ -3660,7 +3701,7 @@ msgstr ""
 msgid "Format"
 msgstr "Format"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:611
+#: shared/web/AuthenticationLoginPasswordWeb.py:608
 msgid ""
 "The account has successfully been created, but a SMTP error has occurred.\n"
 "Maybe the Mail Transport Agent on the Glasnost server is badly configured."
@@ -3689,7 +3730,7 @@ msgstr "Neue Person"
 msgid "Suriname"
 msgstr "Spitzname"
 
-#: shared/common/VirtualHostsCommon.py:58
+#: shared/common/VirtualHostsCommon.py:60
 #, fuzzy
 msgid "Default Virtual Host"
 msgstr "Neuer virtuelle Host"
@@ -3706,7 +3747,7 @@ msgstr "Stimmzettel Typ"
 msgid "State"
 msgstr "Zustand"
 
-#: shared/common/kinds.py:2727
+#: shared/common/kinds.py:2689
 #, fuzzy
 msgid "Select accepted types of items."
 msgstr "Auswählen Sie den Kandidat zu hinzufügen"
@@ -3719,7 +3760,7 @@ msgstr ""
 msgid "Administrators"
 msgstr "Verwalter"
 
-#: shared/common/faults.py:240
+#: shared/common/faults.py:241
 msgid "Specified file path does not exist!"
 msgstr "Der spezifierte Zugangsweg zur Datei besteht nicht!"
 
@@ -3765,7 +3806,7 @@ msgstr ""
 "%s\n"
 
 #: shared/common/kinds.py:980 shared/common/kinds.py:1487
-#: shared/common/kinds.py:1685
+#: shared/common/kinds.py:1647
 #, fuzzy
 msgid "Numbers"
 msgstr "Zahl"
@@ -3804,8 +3845,8 @@ msgstr "Libanesisches Pfund"
 
 #: shared/common/ArticlesCommon.py:64 shared/common/kinds.py:378
 #: shared/common/kinds.py:1372 shared/common/kinds.py:1454
-#: shared/common/kinds.py:2353 shared/common/kinds.py:3206
-#: shared/common/kinds.py:3208 shared/web/AppointmentsWeb.py:64
+#: shared/common/kinds.py:2315 shared/common/kinds.py:3168
+#: shared/common/kinds.py:3170 shared/web/AppointmentsWeb.py:66
 #: shared/web/BrevesWeb.py:63 shared/web/CommentsWeb.py:62
 #: shared/web/ArticlesWeb.py:78
 msgid "Text"
@@ -3820,7 +3861,7 @@ msgstr "Deutsch"
 msgid "hour"
 msgstr "Verfasser"
 
-#: shared/common/faults.py:133
+#: shared/common/faults.py:134
 #, fuzzy
 msgid "Unknown error"
 msgstr "Unbekannt"
@@ -3843,7 +3884,7 @@ msgstr "M
 msgid "Text Format"
 msgstr "Format"
 
-#: shared/common/kinds.py:1674
+#: shared/common/kinds.py:1636
 #, fuzzy
 msgid "Maximum Value"
 msgstr "Gruppe in Abwesenheit"
@@ -3907,8 +3948,8 @@ msgstr "Philippinischer Peso"
 msgid "Denmark"
 msgstr ""
 
-#: shared/common/kinds.py:3279 shared/common/kinds.py:3298
-#: shared/common/kinds.py:3316
+#: shared/common/kinds.py:3241 shared/common/kinds.py:3260
+#: shared/common/kinds.py:3278
 #, fuzzy
 msgid "Embedded"
 msgstr "Vollendet"
@@ -3941,7 +3982,7 @@ msgstr "SPIP"
 msgid "\"%s\" ImplementationsreadLanguages"
 msgstr ""
 
-#: shared/common/kinds.py:2923
+#: shared/common/kinds.py:2885
 msgid "Select the people and groups who are allowed to read the item."
 msgstr ""
 
@@ -3979,10 +4020,15 @@ msgstr "Unterschieden"
 msgid "short article"
 msgstr "Kurznachricht"
 
-#: shared/common/kinds.py:2563
+#: shared/common/kinds.py:2525
 msgid "Minimum Number of Items to Edit"
 msgstr ""
 
+#: profiles/vote.xml.in.h:1
+#, fuzzy
+msgid "Electronic Voting"
+msgstr "Dauer der Wahl"
+
 #: shared/common/kinds.py:1488
 msgid "Float Number"
 msgstr "Float"
@@ -4034,8 +4080,8 @@ msgstr "Herausgehen"
 msgid "Re-enter your new password."
 msgstr "Emailaddresse"
 
-#: shared/common/kinds.py:1783 shared/common/kinds.py:3280
-#: shared/common/kinds.py:3299 shared/common/kinds.py:3317
+#: shared/common/kinds.py:1745 shared/common/kinds.py:3242
+#: shared/common/kinds.py:3261 shared/common/kinds.py:3279
 msgid "Link"
 msgstr "Bindung"
 
@@ -4060,7 +4106,7 @@ msgstr "Kuwait Dinar"
 msgid "CRANS"
 msgstr ""
 
-#: shared/common/kinds.py:2930 shared/common/kinds.py:2932
+#: shared/common/kinds.py:2892 shared/common/kinds.py:2894
 msgid "Readers"
 msgstr "Leser"
 
@@ -4111,7 +4157,7 @@ msgstr ""
 msgid "Enter your email address."
 msgstr "Emailaddresse"
 
-#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1310
+#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1309
 msgid " (at <%s>)"
 msgstr ""
 
@@ -4140,7 +4186,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Passwort wechseln"
 
-#: shared/common/faults.py:256
+#: shared/common/faults.py:257
 msgid "Access to file is denied!"
 msgstr "Verbotene Zugangsweg zur Datei !"
 
@@ -4149,7 +4195,7 @@ msgstr "Verbotene Zugangsweg zur Datei !"
 msgid "Singapore"
 msgstr "Dollar von Singapur"
 
-#: shared/common/VirtualHostsCommon.py:101
+#: shared/common/VirtualHostsCommon.py:161
 msgid "Web Host Name"
 msgstr "Web Host Name"
 
@@ -4195,7 +4241,7 @@ msgstr ""
 "<p>Die Kandidaten <i>%(candidates)s</i> erzielen die beste Durchschnitte.</"
 "p><p>Die Kandidaten %(candidates)s erzielen den Wahlsieg.</p>"
 
-#: shared/common/kinds.py:3573 shared/web/GroupsWeb.py:114
+#: shared/common/kinds.py:3535 shared/web/GroupsWeb.py:114
 msgid "Items"
 msgstr "Bestandteile"
 
@@ -4217,7 +4263,7 @@ msgstr ""
 "<p>Der Kandidat \"<i>%(candidate)s</i>\" erreicht den besten Durchschnitt.</"
 "p><p>Der Kandidat \"<i>%(candidate)s</i>\" erzielt den Wahlsieg.</p>"
 
-#: shared/web/AppointmentsWeb.py:75
+#: shared/web/AppointmentsWeb.py:77
 #, fuzzy
 msgid "Categories"
 msgstr "Kapitel"
@@ -4227,7 +4273,7 @@ msgid "True"
 msgstr ""
 
 #: shared/common/TranslationsCommon.py:138 shared/web/TranslationsWeb.py:174
-#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:900
+#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:908
 msgid "Translation"
 msgstr "Übersetzung"
 
@@ -4235,16 +4281,16 @@ msgstr "
 msgid "Entrouvert.com"
 msgstr ""
 
-#: shared/common/kinds.py:3090
+#: shared/common/kinds.py:3052
 #, fuzzy
 msgid "Glasnost Server ID"
 msgstr "Glasnost Id"
 
-#: shared/common/kinds.py:3664 shared/common/kinds.py:3668
+#: shared/common/kinds.py:3626 shared/common/kinds.py:3630
 msgid "Modification Time"
 msgstr "Veränderungsdatum"
 
-#: shared/web/AppointmentsWeb.py:222
+#: shared/web/AppointmentsWeb.py:224
 #, fuzzy
 msgid "Past events"
 msgstr "Ereignisse"
@@ -4253,7 +4299,7 @@ msgstr "Ereignisse"
 msgid "HTML"
 msgstr "HTML"
 
-#: shared/common/kinds.py:3296
+#: shared/common/kinds.py:3258
 #, fuzzy
 msgid "Access in Edition Mode"
 msgstr "Bearbeitungsdatum"
@@ -4285,7 +4331,11 @@ msgstr "GnuPG Fingerabdruck"
 msgid "preferences"
 msgstr "Bevorzugungen"
 
-#: shared/web/widgets.py:1871
+#: shared/common/xhtmlgenerator.py:92
+msgid "Pester Absentionnists"
+msgstr "Stimmenthalter mahnen"
+
+#: shared/web/widgets.py:1890
 #, fuzzy
 msgid "other:"
 msgstr "Wähler:"
@@ -4294,15 +4344,15 @@ msgstr "W
 msgid "vote"
 msgstr "Stimmabgabe"
 
-#: shared/web/ElectionsWeb.py:70
-msgid "Kind of Ballots"
-msgstr "Stimmzettel Typ"
+#: shared/web/geography.py:179
+msgid "Norway"
+msgstr ""
 
 #: shared/web/TranslationsWeb.py:252
 msgid "Translators"
 msgstr "Übersetzer"
 
-#: shared/web/widgets.py:1739
+#: shared/web/widgets.py:1755
 msgid "download"
 msgstr ""
 
@@ -4324,8 +4374,8 @@ msgstr "Speicherung"
 msgid "Single-Line Text Entry Field"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:205 shared/web/AppointmentsWeb.py:217
-#: shared/web/widgets.py:1872
+#: shared/web/AppointmentsWeb.py:207 shared/web/AppointmentsWeb.py:219
+#: shared/web/widgets.py:1891
 msgid "Label"
 msgstr "Etikett"
 
@@ -4374,10 +4424,10 @@ msgstr "Ausw
 msgid "Select the front article of this heading."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:1194
+#: shared/common/kinds.py:3767
 #, fuzzy
-msgid "No comment."
-msgstr "Bemerkung"
+msgid "Next Object"
+msgstr "Neues Objekt"
 
 #: shared/common/modes.py:219
 #, fuzzy
@@ -4402,7 +4452,7 @@ msgstr ""
 msgid "Edition Aspect"
 msgstr "Bearbeitungsdatum"
 
-#: shared/common/kinds.py:2366
+#: shared/common/kinds.py:2328
 msgid "Invalid values"
 msgstr ""
 
@@ -4411,7 +4461,7 @@ msgstr ""
 msgid "minute"
 msgstr "Zahl"
 
-#: shared/web/AppointmentsWeb.py:675
+#: shared/web/AppointmentsWeb.py:678
 msgid "Week"
 msgstr ""
 
@@ -4479,7 +4529,7 @@ msgstr "Inhalt"
 msgid "Choose the candidates for this election."
 msgstr "Stimmabgabe auf vollendeten Wahlen"
 
-#: shared/web/AppointmentsWeb.py:673 shared/web/widgets.py:628
+#: shared/web/AppointmentsWeb.py:676 shared/web/widgets.py:628
 msgid "Day"
 msgstr "Tag"
 
@@ -4510,7 +4560,7 @@ msgstr "Kandidat"
 msgid "Creation Aspect"
 msgstr "Schaffungsdatum"
 
-#: shared/common/kinds.py:1559 shared/common/ObjectsCommon.py:215
+#: shared/common/kinds.py:1521 shared/common/ObjectsCommon.py:215
 msgid "Object"
 msgstr "Objekt"
 
@@ -4587,10 +4637,10 @@ msgstr ""
 msgid "Election in progress"
 msgstr "Durchgehende Wahl"
 
-#: shared/common/kinds.py:3850 shared/common/values.py:53
+#: shared/web/CommentsWeb.py:156
 #, fuzzy
-msgid "Kind"
-msgstr "Suchen"
+msgid "Editorial Comments"
+msgstr "Bemerkung"
 
 #: shared/common/widgets.py:274
 #, fuzzy
@@ -4610,20 +4660,20 @@ msgstr ""
 msgid "Somalia"
 msgstr "Misserfolg"
 
-#: shared/web/tools.py:633
+#: shared/web/tools.py:622
 #, fuzzy
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: shared/common/VirtualHostsCommon.py:149 shared/web/AppointmentsWeb.py:97
+#: shared/common/VirtualHostsCommon.py:243 shared/web/AppointmentsWeb.py:99
 #: shared/web/ElectionsWeb.py:128 shared/web/BrevesWeb.py:73
-#: shared/web/CommentsWeb.py:69 shared/web/ForumsWeb.py:71
-#: shared/web/UploadFilesWeb.py:107 shared/web/widgets.py:932
-#: shared/web/ArticlesWeb.py:87 shared/web/SystemFilesWeb.py:82
+#: shared/web/ForumsWeb.py:71 shared/web/UploadFilesWeb.py:107
+#: shared/web/widgets.py:932 shared/web/ArticlesWeb.py:87
+#: shared/web/SystemFilesWeb.py:82
 msgid "Title"
 msgstr "Titel"
 
-#: shared/common/kinds.py:2838 shared/common/kinds.py:2840
+#: shared/common/kinds.py:2800 shared/common/kinds.py:2802
 msgid "Authors"
 msgstr "Verfasser"
 
@@ -4646,6 +4696,14 @@ msgstr ""
 msgid "Canada"
 msgstr "Kandidat"
 
+#, fuzzy
+#~ msgid "Enter the title of your comment."
+#~ msgstr "Die letzte virtuellen Hosts"
+
+#, fuzzy
+#~ msgid "Function Name"
+#~ msgstr "Vorname"
+
 #~ msgid "Can't change value!"
 #~ msgstr "Unmöglich den Wert zu wechseln !"
 
@@ -5084,10 +5142,6 @@ msgstr "Kandidat"
 #~ msgid "New Organization"
 #~ msgstr "Übersetzung"
 
-#, fuzzy
-#~ msgid "Function Calls"
-#~ msgstr "Gesendeter Anruf"
-
 #~ msgid "The sending of the password by email to %s has failed!"
 #~ msgstr "Die Sendung des Passwortes per Email zu %s ist gescheitert!"
 
diff --git a/po/glasnost-web/es.po b/po/glasnost-web/es.po
index 32588a12..584e221f 100644
--- a/po/glasnost-web/es.po
+++ b/po/glasnost-web/es.po
@@ -25,7 +25,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glasnost-web $Revision$\n"
-"POT-Creation-Date: Thu Nov  6 13:19:42 2003\n"
+"POT-Creation-Date: Tue Nov 18 16:12:53 2003\n"
 "PO-Revision-Date: 2003-01-15 16:40+0100\n"
 "Last-Translator: Emmanuel Raviart <eraviart@entrouvert.com>\n"
 "Language-Team: Spanish <fr@li.org>\n"
@@ -37,11 +37,11 @@ msgstr ""
 msgid "in3activa"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:249
+#: shared/common/VirtualHostsCommon.py:343
 msgid "Virtual Hosts"
 msgstr ""
 
-#: shared/common/kinds.py:1742
+#: shared/common/kinds.py:1704
 msgid "Integer Choice"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 msgid "New Translation"
 msgstr ""
 
-#: shared/common/kinds.py:2585
+#: shared/common/kinds.py:2547
 msgid "Sequence"
 msgstr ""
 
@@ -97,8 +97,8 @@ msgstr ""
 msgid "Secret Ballot"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:249
-msgid "Changing User Password"
+#: shared/common/CommentsCommon.py:86
+msgid "some comment"
 msgstr ""
 
 #: shared/common/ElectionsCommon.py:144
@@ -109,7 +109,7 @@ msgstr ""
 msgid "Cyprus"
 msgstr ""
 
-#: shared/common/kinds.py:222 shared/common/kinds.py:3278
+#: shared/common/kinds.py:222 shared/common/kinds.py:3240
 msgid "Same As Edition Mode"
 msgstr ""
 
@@ -121,11 +121,11 @@ msgstr ""
 msgid "Check Box"
 msgstr ""
 
-#: shared/common/kinds.py:2467
+#: shared/common/kinds.py:2429
 msgid "Execute On Submit"
 msgstr ""
 
-#: shared/common/kinds.py:3703
+#: shared/common/kinds.py:3665
 msgid "User Token"
 msgstr ""
 
@@ -146,6 +146,10 @@ msgstr ""
 msgid "New Heading"
 msgstr ""
 
+#: shared/web/AuthenticationLoginPasswordWeb.py:249
+msgid "Changing User Password"
+msgstr ""
+
 #: shared/web/calendaring.py:60
 msgid "February"
 msgstr ""
@@ -154,7 +158,7 @@ msgstr ""
 msgid "Liberia"
 msgstr ""
 
-#: shared/common/kinds.py:3253
+#: shared/common/kinds.py:3215
 msgid "Structure"
 msgstr ""
 
@@ -163,7 +167,7 @@ msgid "Saint Kitts and Nevis"
 msgstr ""
 
 #: shared/common/AuthenticationLoginPasswordCommon.py:64
-#: shared/common/kinds.py:2355 shared/common/AuthenticationLdapCommon.py:63
+#: shared/common/kinds.py:2317 shared/common/AuthenticationLdapCommon.py:63
 #: shared/web/AuthenticationLoginPasswordWeb.py:69
 #: shared/web/AuthenticationLoginPasswordWeb.py:146
 msgid "Password"
@@ -209,12 +213,12 @@ msgstr ""
 msgid "Counting of the Votes"
 msgstr ""
 
-#: shared/common/kinds.py:2536
+#: shared/common/kinds.py:2498
 msgid "Script Source Code"
 msgstr ""
 
-#: shared/web/geography.py:65
-msgid "Burkina Faso"
+#: shared/web/VotesWeb.py:373
+msgid "Voter"
 msgstr ""
 
 #: shared/common/kinds.py:97
@@ -277,11 +281,11 @@ msgstr ""
 msgid "Add %s To Rubric"
 msgstr ""
 
-#: shared/web/GlasnostTALInterpreter.py:64
+#: shared/web/GlasnostTALInterpreter.py:67
 msgid "Error in generated HTML"
 msgstr ""
 
-#: shared/common/kinds.py:1749
+#: shared/common/kinds.py:1711
 msgid "Select the language used to fill in this card."
 msgstr ""
 
@@ -364,10 +368,14 @@ msgstr ""
 msgid "files"
 msgstr ""
 
-#: shared/common/kinds.py:3980
+#: shared/common/kinds.py:3942
 msgid "Widget Name"
 msgstr ""
 
+#: shared/web/CommentsWeb.py:168
+msgid "Add Comment"
+msgstr ""
+
 #: shared/web/TranslationsWeb.py:165 shared/web/TranslationsWeb.py:612
 #: shared/web/GradesWeb.py:85 shared/web/widgets.py:152
 #: shared/web/widgets.py:932 shared/web/widgets.py:938
@@ -396,14 +404,18 @@ msgstr ""
 msgid "Vote Blank"
 msgstr ""
 
+#: profiles/basic.xml.in.h:1
+msgid "Basic Functionalities"
+msgstr ""
+
 #: shared/web/AuthenticationLoginPasswordWeb.py:302
 msgid "Delete Account"
 msgstr ""
 
-#: shared/common/faults.py:324 shared/common/faults.py:486
-#: shared/common/faults.py:494 shared/common/faults.py:502
-#: shared/common/faults.py:510 shared/common/faults.py:518
-#: shared/common/faults.py:526
+#: shared/common/faults.py:325 shared/common/faults.py:487
+#: shared/common/faults.py:495 shared/common/faults.py:503
+#: shared/common/faults.py:511 shared/common/faults.py:519
+#: shared/common/faults.py:527
 msgid "Value already used!"
 msgstr ""
 
@@ -419,11 +431,11 @@ msgstr ""
 msgid "Editing %s Settings"
 msgstr ""
 
-#: shared/web/geography.py:77
-msgid "Belarus"
+#: shared/web/geography.py:65
+msgid "Burkina Faso"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:344
+#: shared/web/AppointmentsWeb.py:346
 msgid "Week %d of %d"
 msgstr ""
 
@@ -443,7 +455,7 @@ msgstr ""
 msgid "Secret Ballots"
 msgstr ""
 
-#: shared/web/tools.py:574
+#: shared/web/tools.py:567
 msgid "Success"
 msgstr ""
 
@@ -463,11 +475,11 @@ msgstr ""
 msgid "Weightings"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:147
+#: shared/common/VirtualHostsCommon.py:241
 msgid "Enter the title of this virtual host."
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:244
+#: shared/common/VirtualHostsCommon.py:338
 msgid "New Virtual Host"
 msgstr ""
 
@@ -483,6 +495,11 @@ msgstr ""
 msgid "Select the items to subtract."
 msgstr ""
 
+#: profiles/cards.xml.in.h:1
+#, fuzzy
+msgid "Cards Support"
+msgstr "Traducir al %s"
+
 #: shared/common/xhtmlgenerator.py:107
 msgid "Use"
 msgstr ""
@@ -555,15 +572,15 @@ msgstr "Traducir al %s"
 msgid "Read the License"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:92
-msgid "Pester Absentionnists"
+#: shared/common/faults.py:558
+msgid "Role not in profiles"
 msgstr ""
 
 #: shared/web/TranslationsWeb.py:550 shared/web/TranslationsWeb.py:564
 msgid "%(from)s to %(to)s"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:102 shared/web/UploadFilesWeb.py:71
+#: shared/common/CommentsCommon.py:104 shared/web/UploadFilesWeb.py:71
 #: shared/web/VotesWeb.py:335
 msgid "Comment"
 msgstr ""
@@ -580,11 +597,11 @@ msgstr ""
 msgid "History - %s"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:439
+#: shared/web/AuthenticationLoginPasswordWeb.py:436
 msgid "Create Account for user:"
 msgstr ""
 
-#: shared/common/kinds.py:3696
+#: shared/common/kinds.py:3658
 msgid "Application Token"
 msgstr ""
 
@@ -592,7 +609,7 @@ msgstr ""
 msgid "Sweden"
 msgstr ""
 
-#: shared/common/kinds.py:3337
+#: shared/common/kinds.py:3299
 msgid "Thing"
 msgstr ""
 
@@ -609,7 +626,7 @@ msgstr ""
 msgid "Translatable"
 msgstr ""
 
-#: shared/common/kinds.py:3635 shared/common/kinds.py:3639
+#: shared/common/kinds.py:3597 shared/common/kinds.py:3601
 msgid "Creation Time"
 msgstr ""
 
@@ -629,7 +646,7 @@ msgstr ""
 msgid "Intersection"
 msgstr ""
 
-#: shared/common/kinds.py:3680
+#: shared/common/kinds.py:3642
 msgid "Token"
 msgstr ""
 
@@ -657,7 +674,7 @@ msgstr ""
 msgid "All Objects"
 msgstr ""
 
-#: shared/common/kinds.py:2346
+#: shared/common/kinds.py:2308
 msgid "Enter Twice"
 msgstr ""
 
@@ -665,7 +682,7 @@ msgstr ""
 msgid "Theridion"
 msgstr ""
 
-#: shared/common/faults.py:475
+#: shared/common/faults.py:476
 msgid "Winners group is not empty!"
 msgstr ""
 
@@ -685,7 +702,7 @@ msgstr ""
 msgid "Current Password"
 msgstr ""
 
-#: shared/web/kinds.py:425
+#: shared/web/kinds.py:418
 msgid "Default Values"
 msgstr ""
 
@@ -720,7 +737,7 @@ msgid ""
 "document as you usually do."
 msgstr ""
 
-#: shared/common/kinds.py:2580
+#: shared/common/kinds.py:2542
 msgid "Minimum Number of Items"
 msgstr ""
 
@@ -728,8 +745,8 @@ msgstr ""
 msgid "Saint Lucia"
 msgstr ""
 
-#: shared/common/faults.py:264 shared/common/faults.py:272
-#: shared/common/faults.py:347
+#: shared/common/faults.py:265 shared/common/faults.py:273
+#: shared/common/faults.py:348
 msgid "Wrong value!"
 msgstr ""
 
@@ -761,7 +778,7 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:364 shared/web/VotesWeb.py:755
+#: shared/web/ObjectsWeb.py:368 shared/web/VotesWeb.py:755
 #: shared/web/modes.py:257
 msgid "Editing %s - %s"
 msgstr ""
@@ -770,7 +787,7 @@ msgstr ""
 msgid "All Label"
 msgstr ""
 
-#: shared/web/tools.py:488
+#: shared/web/tools.py:431 shared/web/tools.py:481
 msgid "(missing item)"
 msgstr ""
 
@@ -790,11 +807,15 @@ msgstr ""
 msgid "Viet Nam"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:78
-msgid "Enter the title of your comment."
+#: shared/web/geography.py:194
+msgid "Romania"
 msgstr ""
 
-#: shared/common/kinds.py:1557 shared/common/kinds.py:3809
+#: shared/web/ElectionsWeb.py:368
+msgid "blank vote"
+msgstr ""
+
+#: shared/common/kinds.py:1519 shared/common/kinds.py:3771
 #: shared/web/BrevesWeb.py:71
 msgid "Links"
 msgstr ""
@@ -811,7 +832,7 @@ msgstr ""
 msgid "DIV With Label"
 msgstr ""
 
-#: shared/common/kinds.py:3955
+#: shared/common/kinds.py:3917
 msgid "Value Holder"
 msgstr ""
 
@@ -819,7 +840,7 @@ msgstr ""
 msgid "Jamaica"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:98
+#: shared/common/VirtualHostsCommon.py:158
 msgid "Enter the host name."
 msgstr ""
 
@@ -831,13 +852,12 @@ msgstr ""
 msgid "New Zealand"
 msgstr ""
 
-#: shared/common/kinds.py:2484
+#: shared/common/kinds.py:2446
 msgid "Script"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:398
+#: shared/common/xhtmlgenerator.py:401
 #: shared/web/AuthenticationLoginPasswordWeb.py:384
-#: shared/web/AuthenticationLoginPasswordWeb.py:431
 msgid "Missing Object (%s)"
 msgstr ""
 
@@ -883,7 +903,7 @@ msgstr ""
 msgid "Congo, the Democratic Republic of the"
 msgstr ""
 
-#: shared/web/CommentsWeb.py:105
+#: shared/web/CommentsWeb.py:106
 msgid "Anonymous"
 msgstr ""
 
@@ -891,7 +911,7 @@ msgstr ""
 msgid "New Election"
 msgstr ""
 
-#: shared/common/kinds.py:1678
+#: shared/common/kinds.py:1640
 msgid "Minimum Value"
 msgstr ""
 
@@ -917,12 +937,17 @@ msgstr ""
 msgid "Tonga"
 msgstr ""
 
+#: profiles/comments.xml.in.h:1
+#, fuzzy
+msgid "Comments Support"
+msgstr "Traducir al %s"
+
 #: shared/web/ArticlesWeb.py:283
 msgid "DocBook Source - %s"
 msgstr ""
 
 #: shared/web/AuthenticationLoginPasswordWeb.py:359
-#: shared/web/AuthenticationLoginPasswordWeb.py:518
+#: shared/web/AuthenticationLoginPasswordWeb.py:515
 msgid "The password has been sent successfully."
 msgstr ""
 
@@ -934,7 +959,7 @@ msgstr ""
 msgid "Analyze"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:56
+#: shared/common/VirtualHostsCommon.py:58
 msgid "Select the default virtual host to use on this server"
 msgstr ""
 
@@ -956,11 +981,11 @@ msgstr ""
 msgid "New Implementation"
 msgstr ""
 
-#: shared/common/faults.py:248
+#: shared/common/faults.py:249
 msgid "Specified path is not a file!"
 msgstr ""
 
-#: shared/common/kinds.py:2798
+#: shared/common/kinds.py:2760
 msgid "Choose the user(s) of this object."
 msgstr ""
 
@@ -1042,7 +1067,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: shared/common/kinds.py:1687
+#: shared/common/kinds.py:1649
 msgid "Integer Number"
 msgstr ""
 
@@ -1083,7 +1108,7 @@ msgstr ""
 msgid "Member of groups"
 msgstr ""
 
-#: shared/common/kinds.py:3119
+#: shared/common/kinds.py:3081
 msgid "Server Role"
 msgstr ""
 
@@ -1091,14 +1116,14 @@ msgstr ""
 msgid "The account and the user card have been removed successfully."
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:84
+#: shared/common/VirtualHostsCommon.py:144
 msgid ""
 "Enter the Glasnost dispatcher id for this virtual host (you may have to "
 "consult your administrator)."
 msgstr ""
 
-#: shared/web/ElectionsWeb.py:368
-msgid "blank vote"
+#: templates/pel-infini/infos.xml.in.h:1
+msgid "infini (assoc brest)"
 msgstr ""
 
 #: shared/web/geography.py:166
@@ -1166,10 +1191,6 @@ msgstr ""
 msgid "Israel"
 msgstr ""
 
-#: shared/web/geography.py:228
-msgid "Uganda"
-msgstr ""
-
 #: shared/web/ElectionsWeb.py:350 shared/web/ElectionsWeb.py:366
 msgid "secret"
 msgstr ""
@@ -1301,7 +1322,7 @@ msgstr ""
 msgid "Nicaragua"
 msgstr ""
 
-#: shared/web/UploadFilesWeb.py:352
+#: shared/web/UploadFilesWeb.py:355
 msgid "Your last files"
 msgstr ""
 
@@ -1317,7 +1338,7 @@ msgstr ""
 msgid "Public Ballot"
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:652
+#: shared/web/ObjectsWeb.py:660
 msgid "Id for \"%s\""
 msgstr ""
 
@@ -1325,7 +1346,7 @@ msgstr ""
 msgid "Heading"
 msgstr ""
 
-#: shared/common/kinds.py:3161
+#: shared/common/kinds.py:3123
 msgid "Slot Name"
 msgstr ""
 
@@ -1333,7 +1354,7 @@ msgstr ""
 msgid "New Alias"
 msgstr ""
 
-#: shared/common/kinds.py:3793
+#: shared/common/kinds.py:3755
 #, fuzzy
 msgid "Action"
 msgstr "Artículo"
@@ -1354,7 +1375,7 @@ msgstr ""
 msgid "Reverse Year Order?"
 msgstr ""
 
-#: shared/common/kinds.py:2741
+#: shared/common/kinds.py:2703
 msgid "Accepted Types"
 msgstr ""
 
@@ -1391,15 +1412,19 @@ msgstr ""
 msgid "Definition"
 msgstr ""
 
+#: profiles/ldap.xml.in.h:1
+msgid "LDAP Support"
+msgstr ""
+
 #: shared/common/CardsCommon.py:607
 msgid "Card"
 msgstr ""
 
-#: shared/common/kinds.py:2852 shared/common/kinds.py:2858
+#: shared/common/kinds.py:2814 shared/common/kinds.py:2820
 msgid "Properties"
 msgstr ""
 
-#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:365
+#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:368
 #: talTranslations.py:6
 msgid "Files"
 msgstr ""
@@ -1448,8 +1473,8 @@ msgstr ""
 msgid "Appointment"
 msgstr ""
 
-#: shared/web/TranslationsWeb.py:125
-msgid "From "
+#: shared/web/ElectionsWeb.py:70
+msgid "Kind of Ballots"
 msgstr ""
 
 #: shared/web/TranslationsWeb.py:232
@@ -1488,10 +1513,6 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
-#: shared/web/geography.py:179
-msgid "Norway"
-msgstr ""
-
 #: shared/common/BrevesCommon.py:199
 msgid "New Short Article"
 msgstr ""
@@ -1516,7 +1537,7 @@ msgstr ""
 msgid "Exclusive Choice"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:101 shared/web/ElectionsWeb.py:316
+#: shared/common/CommentsCommon.py:103 shared/web/ElectionsWeb.py:316
 msgid "comment"
 msgstr ""
 
@@ -1544,7 +1565,7 @@ msgstr ""
 msgid "Malaysia"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:677 shared/web/widgets.py:612
+#: shared/web/AppointmentsWeb.py:680 shared/web/widgets.py:612
 msgid "Month"
 msgstr ""
 
@@ -1560,7 +1581,7 @@ msgstr ""
 msgid "The last system files to administer"
 msgstr ""
 
-#: shared/common/faults.py:549
+#: shared/common/faults.py:550
 msgid "Value too big!"
 msgstr ""
 
@@ -1570,6 +1591,10 @@ msgid ""
 "</p><p>The candidate \"<i> %(candidate)s</i>\" wins the election.</p>"
 msgstr ""
 
+#: shared/common/CommentsCommon.py:75
+msgid "Editorial Comment ?"
+msgstr ""
+
 #: shared/common/ArticlesCommon.py:145
 msgid "article"
 msgstr ""
@@ -1582,12 +1607,12 @@ msgstr ""
 msgid "Choose whether to crypt e-mails Glasnost sends to you."
 msgstr ""
 
-#: shared/common/kinds.py:1839
+#: shared/common/kinds.py:1801
 msgid "Mapping"
 msgstr ""
 
-#: templates/linuxdays/infos.xml.in.h:1
-msgid "Luxembourg LinuxDays"
+#: shared/common/VirtualHostsCommon.py:174
+msgid "Usage Profiles"
 msgstr ""
 
 #: shared/web/geography.py:165
@@ -1651,7 +1676,7 @@ msgstr ""
 msgid "Version Number"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:91
+#: shared/web/AppointmentsWeb.py:93
 msgid "Select the people and groups who are assigned to this appointment."
 msgstr ""
 
@@ -1682,6 +1707,14 @@ msgstr ""
 msgid "Table with One-on-One comparisons of the candidates"
 msgstr ""
 
+#: glasnost-web/siteMap.py:69
+msgid "Site Map"
+msgstr ""
+
+#: shared/common/xhtmlgenerator.py:62
+msgid "Abstain"
+msgstr ""
+
 #: shared/web/TranslationsWeb.py:208
 msgid "Good"
 msgstr ""
@@ -1738,7 +1771,7 @@ msgstr ""
 msgid "Your elections being written"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:210
+#: shared/web/AppointmentsWeb.py:212
 msgid "Future events"
 msgstr ""
 
@@ -1826,7 +1859,7 @@ msgstr ""
 msgid "Monaco"
 msgstr ""
 
-#: shared/common/kinds.py:3811
+#: shared/common/kinds.py:3773
 msgid "Push Button"
 msgstr ""
 
@@ -1855,7 +1888,7 @@ msgstr ""
 msgid "Finnish"
 msgstr ""
 
-#: shared/common/kinds.py:2747
+#: shared/common/kinds.py:2709
 msgid "Accepted Roles"
 msgstr ""
 
@@ -1875,7 +1908,7 @@ msgstr ""
 msgid "Argentina"
 msgstr ""
 
-#: shared/common/kinds.py:3781
+#: shared/common/kinds.py:3743
 msgid "Extended Choice"
 msgstr ""
 
@@ -1892,7 +1925,7 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:635
+#: shared/web/AppointmentsWeb.py:638
 msgid "Hour: %s - %s"
 msgstr ""
 
@@ -1900,7 +1933,7 @@ msgstr ""
 msgid "Cuba"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:103
+#: shared/common/CommentsCommon.py:105
 msgid "comments"
 msgstr ""
 
@@ -1932,7 +1965,7 @@ msgstr ""
 msgid "Subject for the \"welcome\" email."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:775
+#: shared/web/ObjectsWeb.py:783
 msgid "Search Results"
 msgstr ""
 
@@ -1956,7 +1989,7 @@ msgstr ""
 msgid "Other Translations"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:124
+#: shared/common/VirtualHostsCommon.py:218
 msgid "Template"
 msgstr ""
 
@@ -1980,8 +2013,7 @@ msgstr ""
 msgid "Malta"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:104 shared/web/ObjectsWeb.py:1206
-#: shared/web/ObjectsWeb.py:1222
+#: shared/common/CommentsCommon.py:106 shared/web/CommentsWeb.py:163
 msgid "Comments"
 msgstr ""
 
@@ -1989,7 +2021,7 @@ msgstr ""
 msgid "Registered Voters:"
 msgstr ""
 
-#: shared/common/kinds.py:3578 shared/web/GroupsWeb.py:88
+#: shared/common/kinds.py:3540 shared/web/GroupsWeb.py:88
 msgid "Union"
 msgstr ""
 
@@ -2009,7 +2041,7 @@ msgstr ""
 msgid "Select the author(s) of the document."
 msgstr ""
 
-#: shared/common/kinds.py:2816
+#: shared/common/kinds.py:2778
 msgid "People Set"
 msgstr ""
 
@@ -2066,12 +2098,17 @@ msgstr ""
 msgid "Egypt"
 msgstr ""
 
+#: profiles/translations.xml.in.h:1
+#, fuzzy
+msgid "Translations Support"
+msgstr "Traducir al %s"
+
 #: shared/web/geography.py:121
 msgid "Honduras"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:62
-msgid "Abstain"
+#: shared/web/AuthenticationLoginPasswordWeb.py:513
+msgid "An error occured while sending the password."
 msgstr ""
 
 #: shared/common/translation.py:66
@@ -2082,21 +2119,17 @@ msgstr ""
 msgid "The last system files"
 msgstr ""
 
-#: templates/pel-infini/infos.xml.in.h:1
-msgid "infini (assoc brest)"
-msgstr ""
-
 #: shared/web/PreferencesWeb.py:70
 msgid "Crypt Emails"
 msgstr ""
 
 #: shared/common/xhtmlgenerator.py:85
-#: shared/web/AuthenticationLoginPasswordWeb.py:496
+#: shared/web/AuthenticationLoginPasswordWeb.py:493
 #: shared/web/AuthenticationLdapWeb.py:124 talTranslations.py:14
 msgid "Login"
 msgstr ""
 
-#: shared/common/faults.py:225
+#: shared/common/faults.py:226
 msgid "Invalid email address"
 msgstr ""
 
@@ -2104,7 +2137,7 @@ msgstr ""
 msgid "Guyana"
 msgstr ""
 
-#: shared/common/kinds.py:3909 shared/common/modes.py:188
+#: shared/common/kinds.py:3871 shared/common/modes.py:188
 msgid "Mode"
 msgstr ""
 
@@ -2132,7 +2165,7 @@ msgstr ""
 msgid "Button"
 msgstr ""
 
-#: shared/common/kinds.py:3826
+#: shared/common/kinds.py:3788
 msgid "Fault"
 msgstr ""
 
@@ -2171,7 +2204,7 @@ msgstr ""
 msgid "View Aspect"
 msgstr ""
 
-#: shared/web/UploadFilesWeb.py:359
+#: shared/web/UploadFilesWeb.py:362
 msgid "The last files"
 msgstr ""
 
@@ -2188,7 +2221,7 @@ msgstr ""
 msgid "Germany"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:121
+#: shared/common/VirtualHostsCommon.py:215
 msgid "Select the template (skin) to use for this host."
 msgstr ""
 
@@ -2212,7 +2245,7 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: shared/common/kinds.py:2812 shared/common/kinds.py:2818
+#: shared/common/kinds.py:2774 shared/common/kinds.py:2780
 msgid "Users"
 msgstr ""
 
@@ -2248,7 +2281,7 @@ msgstr ""
 msgid "headings"
 msgstr ""
 
-#: shared/common/kinds.py:3771 shared/common/kinds.py:3773
+#: shared/common/kinds.py:3733 shared/common/kinds.py:3735
 msgid "Writers"
 msgstr ""
 
@@ -2272,7 +2305,7 @@ msgstr ""
 msgid "Winners Grading"
 msgstr ""
 
-#: shared/common/kinds.py:3314
+#: shared/common/kinds.py:3276
 msgid "Access in View Mode"
 msgstr ""
 
@@ -2334,7 +2367,7 @@ msgstr ""
 msgid "Header 6"
 msgstr ""
 
-#: shared/common/faults.py:362
+#: shared/common/faults.py:363
 msgid "Missing value!"
 msgstr ""
 
@@ -2358,6 +2391,10 @@ msgstr ""
 msgid "Enter the text of your comment."
 msgstr ""
 
+#: templates/linuxdays/infos.xml.in.h:1
+msgid "Luxembourg LinuxDays"
+msgstr ""
+
 #: shared/web/geography.py:226
 msgid "Tanzania, United Republic of"
 msgstr ""
@@ -2389,7 +2426,7 @@ msgstr ""
 msgid "Are you sure you want to delete the %s \"%s\" ?"
 msgstr ""
 
-#: shared/common/kinds.py:3764
+#: shared/common/kinds.py:3726
 msgid "Select the people and groups who are allowed to modify the item."
 msgstr ""
 
@@ -2414,7 +2451,7 @@ msgstr ""
 msgid "Gambia"
 msgstr ""
 
-#: shared/common/kinds.py:1755 shared/common/kinds.py:1763
+#: shared/common/kinds.py:1717 shared/common/kinds.py:1725
 msgid "Language"
 msgstr "Lengua"
 
@@ -2434,9 +2471,9 @@ msgstr ""
 msgid "Blank Ballots:"
 msgstr ""
 
-#: shared/common/kinds.py:1103 shared/common/kinds.py:1761
-#: shared/common/kinds.py:2482 shared/common/kinds.py:2583
-#: shared/common/kinds.py:3945
+#: shared/common/kinds.py:1103 shared/common/kinds.py:1723
+#: shared/common/kinds.py:2444 shared/common/kinds.py:2545
+#: shared/common/kinds.py:3907
 msgid "Data"
 msgstr ""
 
@@ -2453,7 +2490,7 @@ msgid "Ties"
 msgstr ""
 
 #: shared/common/kinds.py:1315 shared/common/widgets.py:207
-#: shared/web/AppointmentsWeb.py:204 shared/web/AppointmentsWeb.py:216
+#: shared/web/AppointmentsWeb.py:206 shared/web/AppointmentsWeb.py:218
 #: shared/web/ArticlesWeb.py:323
 msgid "Date"
 msgstr ""
@@ -2484,7 +2521,7 @@ msgstr ""
 msgid "Editing Translation"
 msgstr ""
 
-#: shared/common/kinds.py:3800
+#: shared/common/kinds.py:3762
 msgid "Next Mode"
 msgstr ""
 
@@ -2514,11 +2551,11 @@ msgid ""
 "Please backup your changes and redo the edition."
 msgstr ""
 
-#: shared/common/CommentsCommon.py:99
+#: shared/common/CommentsCommon.py:101
 msgid "New Comment"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:469
+#: shared/web/AuthenticationLoginPasswordWeb.py:466
 #: shared/web/AuthenticationLdapWeb.py:99
 msgid "To access this part of the site, you need to sign in."
 msgstr ""
@@ -2531,11 +2568,11 @@ msgstr ""
 msgid "xOctober"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:93
+#: shared/web/AppointmentsWeb.py:95
 msgid "Participants"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:95
+#: shared/web/AppointmentsWeb.py:97
 msgid "Start"
 msgstr ""
 
@@ -2551,8 +2588,8 @@ msgstr ""
 msgid "Dominica"
 msgstr ""
 
-#: shared/web/VotesWeb.py:373
-msgid "Voter"
+#: shared/web/TranslationsWeb.py:125
+msgid "From "
 msgstr ""
 
 #: shared/common/VotesCommon.py:372 shared/web/ElectionsWeb.py:284
@@ -2568,7 +2605,7 @@ msgstr ""
 msgid "(%d words)"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:238
+#: shared/web/AppointmentsWeb.py:240
 msgid "Day long appointments"
 msgstr ""
 
@@ -2588,8 +2625,8 @@ msgstr ""
 msgid "Minimum Year Value Difference to Now"
 msgstr ""
 
-#: shared/common/kinds.py:3805
-msgid "Next Object"
+#: shared/web/geography.py:228
+msgid "Uganda"
 msgstr ""
 
 #: shared/common/RubricsCommon.py:114
@@ -2604,7 +2641,7 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#: shared/common/kinds.py:2573
+#: shared/common/kinds.py:2535
 msgid "Item Type"
 msgstr ""
 
@@ -2632,7 +2669,7 @@ msgstr ""
 msgid "Chad"
 msgstr ""
 
-#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:90
+#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:150
 msgid "Glasnost Dispatcher ID"
 msgstr ""
 
@@ -2702,12 +2739,12 @@ msgstr ""
 msgid "Bolivia"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:248 shared/common/widgets.py:154
+#: shared/common/xhtmlgenerator.py:251 shared/common/widgets.py:154
 #: shared/common/widgets.py:358 shared/web/widgets.py:506
 msgid "None"
 msgstr ""
 
-#: shared/common/kinds.py:2472
+#: shared/common/kinds.py:2434
 msgid "Source Code"
 msgstr ""
 
@@ -2747,7 +2784,7 @@ msgid ""
 "be displayed."
 msgstr ""
 
-#: shared/common/faults.py:541
+#: shared/common/faults.py:542
 msgid "Value too small!"
 msgstr ""
 
@@ -2755,6 +2792,10 @@ msgstr ""
 msgid "Link Entry Field"
 msgstr ""
 
+#: profiles/cms.xml.in.h:1
+msgid "Content Management System"
+msgstr ""
+
 #: shared/web/geography.py:178
 msgid "Netherlands"
 msgstr ""
@@ -2772,12 +2813,8 @@ msgstr ""
 msgid "Evaluate"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:516
-msgid "An error occured while sending the password."
-msgstr ""
-
-#: shared/web/geography.py:194
-msgid "Romania"
+#: shared/web/geography.py:77
+msgid "Belarus"
 msgstr ""
 
 #: shared/web/geography.py:176
@@ -2798,7 +2835,7 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#: shared/common/kinds.py:2373
+#: shared/common/kinds.py:2335
 msgid "Python Identifier"
 msgstr ""
 
@@ -2863,11 +2900,11 @@ msgstr ""
 msgid "Multi-Line Field"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:247
+#: shared/common/VirtualHostsCommon.py:341
 msgid "Virtual Host"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:88
+#: shared/web/AppointmentsWeb.py:90
 msgid "End"
 msgstr ""
 
@@ -2896,10 +2933,6 @@ msgstr ""
 msgid "Kenya"
 msgstr ""
 
-#: shared/common/kinds.py:1517
-msgid "Function Name"
-msgstr ""
-
 #: shared/web/geography.py:152
 msgid "Lesotho"
 msgstr ""
@@ -2912,7 +2945,7 @@ msgstr ""
 msgid "Best Average"
 msgstr ""
 
-#: shared/common/kinds.py:3865
+#: shared/common/kinds.py:3827
 msgid "Kind Name"
 msgstr ""
 
@@ -2932,7 +2965,7 @@ msgid ""
 "items."
 msgstr ""
 
-#: shared/common/BrevesCommon.py:204 shared/web/tools.py:627
+#: shared/common/BrevesCommon.py:204 shared/web/tools.py:616
 #: shared/web/BrevesWeb.py:168 talTranslations.py:17
 msgid "Short News"
 msgstr ""
@@ -2961,7 +2994,7 @@ msgstr ""
 msgid "The election \"%s\""
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:225 shared/web/AppointmentsWeb.py:683
+#: shared/web/AppointmentsWeb.py:227 shared/web/AppointmentsWeb.py:686
 msgid "Agenda"
 msgstr ""
 
@@ -3073,7 +3106,7 @@ msgstr ""
 msgid "Authentication (LDAP)"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:248
+#: shared/common/VirtualHostsCommon.py:342
 msgid "virtual hosts"
 msgstr ""
 
@@ -3081,7 +3114,7 @@ msgstr ""
 msgid "group"
 msgstr ""
 
-#: shared/common/kinds.py:436 shared/common/kinds.py:3966
+#: shared/common/kinds.py:436 shared/common/kinds.py:3928
 #: shared/common/xhtmlgenerator.py:114 shared/common/modes.py:141
 #: shared/common/widgets.py:80 shared/common/widgets.py:84
 msgid "Widget"
@@ -3095,7 +3128,7 @@ msgstr ""
 msgid "New Forum"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:57
+#: shared/web/AppointmentsWeb.py:59
 msgid "Categories Group"
 msgstr ""
 
@@ -3148,7 +3181,7 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:246
+#: shared/common/VirtualHostsCommon.py:340
 msgid "virtual host"
 msgstr ""
 
@@ -3160,7 +3193,7 @@ msgstr ""
 msgid "Sao Tome and Principe"
 msgstr ""
 
-#: shared/common/kinds.py:2826
+#: shared/common/kinds.py:2788
 msgid "Choose the author(s) for this object."
 msgstr ""
 
@@ -3172,12 +3205,16 @@ msgstr ""
 msgid "Public Ballots"
 msgstr ""
 
-#: shared/common/kinds.py:3946 shared/common/UploadFilesCommon.py:135
+#: shared/common/kinds.py:3908 shared/common/UploadFilesCommon.py:135
 #: shared/common/uploads.py:74 shared/web/UploadFilesWeb.py:77
 #: shared/web/uploads.py:67
 msgid "File"
 msgstr ""
 
+#: shared/common/kinds.py:3812 shared/common/values.py:53
+msgid "Kind"
+msgstr ""
+
 #: shared/common/kinds.py:1267 shared/common/kinds.py:1269
 msgid "Date & Time"
 msgstr ""
@@ -3190,7 +3227,7 @@ msgstr ""
 msgid "Enter the name of this heading."
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:678 shared/web/widgets.py:598
+#: shared/web/AppointmentsWeb.py:681 shared/web/widgets.py:598
 msgid "Year"
 msgstr ""
 
@@ -3200,7 +3237,7 @@ msgstr ""
 
 #: shared/common/xhtmlgenerator.py:90
 #: shared/web/AuthenticationLoginPasswordWeb.py:371
-#: shared/web/AuthenticationLoginPasswordWeb.py:576
+#: shared/web/AuthenticationLoginPasswordWeb.py:573
 msgid "New Account"
 msgstr ""
 
@@ -3252,7 +3289,7 @@ msgstr ""
 msgid "Alias"
 msgstr ""
 
-#: shared/common/kinds.py:3276
+#: shared/common/kinds.py:3238
 msgid "Access in Creation Mode"
 msgstr ""
 
@@ -3276,7 +3313,7 @@ msgstr ""
 msgid "Eritrea"
 msgstr ""
 
-#: shared/common/kinds.py:2462
+#: shared/common/kinds.py:2424
 msgid "Execute On Display"
 msgstr ""
 
@@ -3336,7 +3373,7 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:611
+#: shared/web/AuthenticationLoginPasswordWeb.py:608
 msgid ""
 "The account has successfully been created, but a SMTP error has occurred.\n"
 "Maybe the Mail Transport Agent on the Glasnost server is badly configured."
@@ -3362,7 +3399,7 @@ msgstr ""
 msgid "Suriname"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:58
+#: shared/common/VirtualHostsCommon.py:60
 msgid "Default Virtual Host"
 msgstr ""
 
@@ -3378,7 +3415,7 @@ msgstr ""
 msgid "State"
 msgstr "Estado"
 
-#: shared/common/kinds.py:2727
+#: shared/common/kinds.py:2689
 msgid "Select accepted types of items."
 msgstr ""
 
@@ -3390,7 +3427,7 @@ msgstr ""
 msgid "Administrators"
 msgstr ""
 
-#: shared/common/faults.py:240
+#: shared/common/faults.py:241
 msgid "Specified file path does not exist!"
 msgstr ""
 
@@ -3428,7 +3465,7 @@ msgid ""
 msgstr ""
 
 #: shared/common/kinds.py:980 shared/common/kinds.py:1487
-#: shared/common/kinds.py:1685
+#: shared/common/kinds.py:1647
 msgid "Numbers"
 msgstr ""
 
@@ -3463,8 +3500,8 @@ msgstr ""
 
 #: shared/common/ArticlesCommon.py:64 shared/common/kinds.py:378
 #: shared/common/kinds.py:1372 shared/common/kinds.py:1454
-#: shared/common/kinds.py:2353 shared/common/kinds.py:3206
-#: shared/common/kinds.py:3208 shared/web/AppointmentsWeb.py:64
+#: shared/common/kinds.py:2315 shared/common/kinds.py:3168
+#: shared/common/kinds.py:3170 shared/web/AppointmentsWeb.py:66
 #: shared/web/BrevesWeb.py:63 shared/web/CommentsWeb.py:62
 #: shared/web/ArticlesWeb.py:78
 msgid "Text"
@@ -3478,7 +3515,7 @@ msgstr ""
 msgid "hour"
 msgstr ""
 
-#: shared/common/faults.py:133
+#: shared/common/faults.py:134
 msgid "Unknown error"
 msgstr ""
 
@@ -3498,7 +3535,7 @@ msgstr ""
 msgid "Text Format"
 msgstr ""
 
-#: shared/common/kinds.py:1674
+#: shared/common/kinds.py:1636
 msgid "Maximum Value"
 msgstr ""
 
@@ -3554,8 +3591,8 @@ msgstr ""
 msgid "Denmark"
 msgstr ""
 
-#: shared/common/kinds.py:3279 shared/common/kinds.py:3298
-#: shared/common/kinds.py:3316
+#: shared/common/kinds.py:3241 shared/common/kinds.py:3260
+#: shared/common/kinds.py:3278
 msgid "Embedded"
 msgstr ""
 
@@ -3586,7 +3623,7 @@ msgstr ""
 msgid "\"%s\" ImplementationsreadLanguages"
 msgstr ""
 
-#: shared/common/kinds.py:2923
+#: shared/common/kinds.py:2885
 msgid "Select the people and groups who are allowed to read the item."
 msgstr ""
 
@@ -3623,10 +3660,14 @@ msgstr ""
 msgid "short article"
 msgstr ""
 
-#: shared/common/kinds.py:2563
+#: shared/common/kinds.py:2525
 msgid "Minimum Number of Items to Edit"
 msgstr ""
 
+#: profiles/vote.xml.in.h:1
+msgid "Electronic Voting"
+msgstr ""
+
 #: shared/common/kinds.py:1488
 msgid "Float Number"
 msgstr ""
@@ -3675,8 +3716,8 @@ msgstr ""
 msgid "Re-enter your new password."
 msgstr ""
 
-#: shared/common/kinds.py:1783 shared/common/kinds.py:3280
-#: shared/common/kinds.py:3299 shared/common/kinds.py:3317
+#: shared/common/kinds.py:1745 shared/common/kinds.py:3242
+#: shared/common/kinds.py:3261 shared/common/kinds.py:3279
 msgid "Link"
 msgstr ""
 
@@ -3700,7 +3741,7 @@ msgstr ""
 msgid "CRANS"
 msgstr ""
 
-#: shared/common/kinds.py:2930 shared/common/kinds.py:2932
+#: shared/common/kinds.py:2892 shared/common/kinds.py:2894
 msgid "Readers"
 msgstr ""
 
@@ -3748,7 +3789,7 @@ msgstr ""
 msgid "Enter your email address."
 msgstr ""
 
-#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1310
+#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1309
 msgid " (at <%s>)"
 msgstr ""
 
@@ -3776,7 +3817,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: shared/common/faults.py:256
+#: shared/common/faults.py:257
 msgid "Access to file is denied!"
 msgstr ""
 
@@ -3784,7 +3825,7 @@ msgstr ""
 msgid "Singapore"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:101
+#: shared/common/VirtualHostsCommon.py:161
 msgid "Web Host Name"
 msgstr ""
 
@@ -3826,7 +3867,7 @@ msgid ""
 "<p>The candidates %(candidates)s win the election.</p>"
 msgstr ""
 
-#: shared/common/kinds.py:3573 shared/web/GroupsWeb.py:114
+#: shared/common/kinds.py:3535 shared/web/GroupsWeb.py:114
 msgid "Items"
 msgstr ""
 
@@ -3844,7 +3885,7 @@ msgid ""
 "<p>The candidate \"<i>%(candidate)s</i>\" wins the election.</p>"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:75
+#: shared/web/AppointmentsWeb.py:77
 msgid "Categories"
 msgstr ""
 
@@ -3853,7 +3894,7 @@ msgid "True"
 msgstr ""
 
 #: shared/common/TranslationsCommon.py:138 shared/web/TranslationsWeb.py:174
-#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:900
+#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:908
 msgid "Translation"
 msgstr ""
 
@@ -3861,15 +3902,15 @@ msgstr ""
 msgid "Entrouvert.com"
 msgstr ""
 
-#: shared/common/kinds.py:3090
+#: shared/common/kinds.py:3052
 msgid "Glasnost Server ID"
 msgstr ""
 
-#: shared/common/kinds.py:3664 shared/common/kinds.py:3668
+#: shared/common/kinds.py:3626 shared/common/kinds.py:3630
 msgid "Modification Time"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:222
+#: shared/web/AppointmentsWeb.py:224
 msgid "Past events"
 msgstr ""
 
@@ -3877,7 +3918,7 @@ msgstr ""
 msgid "HTML"
 msgstr ""
 
-#: shared/common/kinds.py:3296
+#: shared/common/kinds.py:3258
 msgid "Access in Edition Mode"
 msgstr ""
 
@@ -3906,7 +3947,11 @@ msgstr ""
 msgid "preferences"
 msgstr ""
 
-#: shared/web/widgets.py:1871
+#: shared/common/xhtmlgenerator.py:92
+msgid "Pester Absentionnists"
+msgstr ""
+
+#: shared/web/widgets.py:1890
 msgid "other:"
 msgstr ""
 
@@ -3914,15 +3959,15 @@ msgstr ""
 msgid "vote"
 msgstr ""
 
-#: shared/web/ElectionsWeb.py:70
-msgid "Kind of Ballots"
+#: shared/web/geography.py:179
+msgid "Norway"
 msgstr ""
 
 #: shared/web/TranslationsWeb.py:252
 msgid "Translators"
 msgstr ""
 
-#: shared/web/widgets.py:1739
+#: shared/web/widgets.py:1755
 msgid "download"
 msgstr ""
 
@@ -3942,8 +3987,8 @@ msgstr ""
 msgid "Single-Line Text Entry Field"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:205 shared/web/AppointmentsWeb.py:217
-#: shared/web/widgets.py:1872
+#: shared/web/AppointmentsWeb.py:207 shared/web/AppointmentsWeb.py:219
+#: shared/web/widgets.py:1891
 msgid "Label"
 msgstr ""
 
@@ -3988,8 +4033,8 @@ msgstr ""
 msgid "Select the front article of this heading."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:1194
-msgid "No comment."
+#: shared/common/kinds.py:3767
+msgid "Next Object"
 msgstr ""
 
 #: shared/common/modes.py:219
@@ -4012,7 +4057,7 @@ msgstr ""
 msgid "Edition Aspect"
 msgstr ""
 
-#: shared/common/kinds.py:2366
+#: shared/common/kinds.py:2328
 msgid "Invalid values"
 msgstr ""
 
@@ -4020,7 +4065,7 @@ msgstr ""
 msgid "minute"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:675
+#: shared/web/AppointmentsWeb.py:678
 msgid "Week"
 msgstr ""
 
@@ -4080,7 +4125,7 @@ msgstr ""
 msgid "Choose the candidates for this election."
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:673 shared/web/widgets.py:628
+#: shared/web/AppointmentsWeb.py:676 shared/web/widgets.py:628
 msgid "Day"
 msgstr ""
 
@@ -4108,7 +4153,7 @@ msgstr ""
 msgid "Creation Aspect"
 msgstr ""
 
-#: shared/common/kinds.py:1559 shared/common/ObjectsCommon.py:215
+#: shared/common/kinds.py:1521 shared/common/ObjectsCommon.py:215
 msgid "Object"
 msgstr ""
 
@@ -4178,8 +4223,8 @@ msgstr ""
 msgid "Election in progress"
 msgstr ""
 
-#: shared/common/kinds.py:3850 shared/common/values.py:53
-msgid "Kind"
+#: shared/web/CommentsWeb.py:156
+msgid "Editorial Comments"
 msgstr ""
 
 #: shared/common/widgets.py:274
@@ -4199,19 +4244,19 @@ msgstr ""
 msgid "Somalia"
 msgstr ""
 
-#: shared/web/tools.py:633
+#: shared/web/tools.py:622
 msgid "Unknown"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:149 shared/web/AppointmentsWeb.py:97
+#: shared/common/VirtualHostsCommon.py:243 shared/web/AppointmentsWeb.py:99
 #: shared/web/ElectionsWeb.py:128 shared/web/BrevesWeb.py:73
-#: shared/web/CommentsWeb.py:69 shared/web/ForumsWeb.py:71
-#: shared/web/UploadFilesWeb.py:107 shared/web/widgets.py:932
-#: shared/web/ArticlesWeb.py:87 shared/web/SystemFilesWeb.py:82
+#: shared/web/ForumsWeb.py:71 shared/web/UploadFilesWeb.py:107
+#: shared/web/widgets.py:932 shared/web/ArticlesWeb.py:87
+#: shared/web/SystemFilesWeb.py:82
 msgid "Title"
 msgstr "Título"
 
-#: shared/common/kinds.py:2838 shared/common/kinds.py:2840
+#: shared/common/kinds.py:2800 shared/common/kinds.py:2802
 msgid "Authors"
 msgstr "Autores"
 
diff --git a/po/glasnost-web/fi.po b/po/glasnost-web/fi.po
index a12dadf0..54d405b1 100644
--- a/po/glasnost-web/fi.po
+++ b/po/glasnost-web/fi.po
@@ -25,7 +25,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glasnost-web $Revision$\n"
-"POT-Creation-Date: Thu Nov  6 13:19:42 2003\n"
+"POT-Creation-Date: Tue Nov 18 16:12:53 2003\n"
 "PO-Revision-Date: 2002-03-29 20:28+0100\n"
 "Last-Translator: Adam Huuva <sventon@easter-eggs.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -38,11 +38,11 @@ msgstr ""
 msgid "in3activa"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:249
+#: shared/common/VirtualHostsCommon.py:343
 msgid "Virtual Hosts"
 msgstr ""
 
-#: shared/common/kinds.py:1742
+#: shared/common/kinds.py:1704
 #, fuzzy
 msgid "Integer Choice"
 msgstr "Äänestäjien valinta"
@@ -90,7 +90,7 @@ msgstr ""
 msgid "New Translation"
 msgstr "Kääntäjät"
 
-#: shared/common/kinds.py:2585
+#: shared/common/kinds.py:2547
 msgid "Sequence"
 msgstr ""
 
@@ -102,10 +102,10 @@ msgstr ""
 msgid "Secret Ballot"
 msgstr "Salainen äänestyslippu"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:249
+#: shared/common/CommentsCommon.py:86
 #, fuzzy
-msgid "Changing User Password"
-msgstr "Vaihda salasana"
+msgid "some comment"
+msgstr "kommentti"
 
 #: shared/common/ElectionsCommon.py:144
 msgid "Choose the persons or groups who will vote for this election."
@@ -115,7 +115,7 @@ msgstr ""
 msgid "Cyprus"
 msgstr ""
 
-#: shared/common/kinds.py:222 shared/common/kinds.py:3278
+#: shared/common/kinds.py:222 shared/common/kinds.py:3240
 msgid "Same As Edition Mode"
 msgstr ""
 
@@ -128,11 +128,11 @@ msgstr "Ei-j
 msgid "Check Box"
 msgstr ""
 
-#: shared/common/kinds.py:2467
+#: shared/common/kinds.py:2429
 msgid "Execute On Submit"
 msgstr ""
 
-#: shared/common/kinds.py:3703
+#: shared/common/kinds.py:3665
 #, fuzzy
 msgid "User Token"
 msgstr "Äänestäjäpoletti"
@@ -157,6 +157,11 @@ msgstr "Editoi"
 msgid "New Heading"
 msgstr "Uusi sijoitus"
 
+#: shared/web/AuthenticationLoginPasswordWeb.py:249
+#, fuzzy
+msgid "Changing User Password"
+msgstr "Vaihda salasana"
+
 #: shared/web/calendaring.py:60
 msgid "February"
 msgstr ""
@@ -165,7 +170,7 @@ msgstr ""
 msgid "Liberia"
 msgstr ""
 
-#: shared/common/kinds.py:3253
+#: shared/common/kinds.py:3215
 msgid "Structure"
 msgstr ""
 
@@ -174,7 +179,7 @@ msgid "Saint Kitts and Nevis"
 msgstr ""
 
 #: shared/common/AuthenticationLoginPasswordCommon.py:64
-#: shared/common/kinds.py:2355 shared/common/AuthenticationLdapCommon.py:63
+#: shared/common/kinds.py:2317 shared/common/AuthenticationLdapCommon.py:63
 #: shared/web/AuthenticationLoginPasswordWeb.py:69
 #: shared/web/AuthenticationLoginPasswordWeb.py:146
 msgid "Password"
@@ -221,13 +226,13 @@ msgstr ""
 msgid "Counting of the Votes"
 msgstr "Äänien laskenta"
 
-#: shared/common/kinds.py:2536
+#: shared/common/kinds.py:2498
 msgid "Script Source Code"
 msgstr ""
 
-#: shared/web/geography.py:65
-msgid "Burkina Faso"
-msgstr ""
+#: shared/web/VotesWeb.py:373
+msgid "Voter"
+msgstr "Äänestäjä"
 
 #: shared/common/kinds.py:97
 #, fuzzy
@@ -292,11 +297,11 @@ msgstr "K
 msgid "Add %s To Rubric"
 msgstr ""
 
-#: shared/web/GlasnostTALInterpreter.py:64
+#: shared/web/GlasnostTALInterpreter.py:67
 msgid "Error in generated HTML"
 msgstr ""
 
-#: shared/common/kinds.py:1749
+#: shared/common/kinds.py:1711
 #, fuzzy
 msgid "Select the language used to fill in this card."
 msgstr "Valitse lisättävä ehdokas"
@@ -385,11 +390,16 @@ msgstr "Katso l
 msgid "files"
 msgstr "tiedostot"
 
-#: shared/common/kinds.py:3980
+#: shared/common/kinds.py:3942
 #, fuzzy
 msgid "Widget Name"
 msgstr "Leveys"
 
+#: shared/web/CommentsWeb.py:168
+#, fuzzy
+msgid "Add Comment"
+msgstr "Kommentti"
+
 #: shared/web/TranslationsWeb.py:165 shared/web/TranslationsWeb.py:612
 #: shared/web/GradesWeb.py:85 shared/web/widgets.py:152
 #: shared/web/widgets.py:932 shared/web/widgets.py:938
@@ -421,15 +431,20 @@ msgstr "K
 msgid "Vote Blank"
 msgstr "Tyhjä ääni"
 
+#: profiles/basic.xml.in.h:1
+#, fuzzy
+msgid "Basic Functionalities"
+msgstr "Soitettu puhelu"
+
 #: shared/web/AuthenticationLoginPasswordWeb.py:302
 #, fuzzy
 msgid "Delete Account"
 msgstr "Uusi käyttäjätili"
 
-#: shared/common/faults.py:324 shared/common/faults.py:486
-#: shared/common/faults.py:494 shared/common/faults.py:502
-#: shared/common/faults.py:510 shared/common/faults.py:518
-#: shared/common/faults.py:526
+#: shared/common/faults.py:325 shared/common/faults.py:487
+#: shared/common/faults.py:495 shared/common/faults.py:503
+#: shared/common/faults.py:511 shared/common/faults.py:519
+#: shared/common/faults.py:527
 msgid "Value already used!"
 msgstr "Arvo jo käytössä"
 
@@ -445,11 +460,11 @@ msgstr ""
 msgid "Editing %s Settings"
 msgstr "%s asetuksien editointi"
 
-#: shared/web/geography.py:77
-msgid "Belarus"
+#: shared/web/geography.py:65
+msgid "Burkina Faso"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:344
+#: shared/web/AppointmentsWeb.py:346
 msgid "Week %d of %d"
 msgstr ""
 
@@ -471,7 +486,7 @@ msgstr "J
 msgid "Secret Ballots"
 msgstr "Salaiset äänestysliput"
 
-#: shared/web/tools.py:574
+#: shared/web/tools.py:567
 msgid "Success"
 msgstr "Onnistunut"
 
@@ -493,12 +508,12 @@ msgstr "Sama arvo annettu kahdesti!"
 msgid "Weightings"
 msgstr "Painot"
 
-#: shared/common/VirtualHostsCommon.py:147
+#: shared/common/VirtualHostsCommon.py:241
 #, fuzzy
 msgid "Enter the title of this virtual host."
 msgstr "Viimeiset artikkelit"
 
-#: shared/common/VirtualHostsCommon.py:244
+#: shared/common/VirtualHostsCommon.py:338
 #, fuzzy
 msgid "New Virtual Host"
 msgstr "Ääni - %s"
@@ -517,6 +532,11 @@ msgstr "Luovutus"
 msgid "Select the items to subtract."
 msgstr "Valitse lisättävä ehdokas"
 
+#: profiles/cards.xml.in.h:1
+#, fuzzy
+msgid "Cards Support"
+msgstr "Kääntäjät"
+
 #: shared/common/xhtmlgenerator.py:107
 #, fuzzy
 msgid "Use"
@@ -596,16 +616,16 @@ msgstr "K
 msgid "Read the License"
 msgstr "Lue lisenssi"
 
-#: shared/common/xhtmlgenerator.py:92
+#: shared/common/faults.py:558
 #, fuzzy
-msgid "Pester Absentionnists"
-msgstr "Luopuneita:"
+msgid "Role not in profiles"
+msgstr "Meneillä oleva äänestys"
 
 #: shared/web/TranslationsWeb.py:550 shared/web/TranslationsWeb.py:564
 msgid "%(from)s to %(to)s"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:102 shared/web/UploadFilesWeb.py:71
+#: shared/common/CommentsCommon.py:104 shared/web/UploadFilesWeb.py:71
 #: shared/web/VotesWeb.py:335
 msgid "Comment"
 msgstr "Kommentti"
@@ -622,12 +642,12 @@ msgstr ""
 msgid "History - %s"
 msgstr "Historiikka - %s"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:439
+#: shared/web/AuthenticationLoginPasswordWeb.py:436
 #, fuzzy
 msgid "Create Account for user:"
 msgstr "Uusi käyttäjätili"
 
-#: shared/common/kinds.py:3696
+#: shared/common/kinds.py:3658
 #, fuzzy
 msgid "Application Token"
 msgstr "Äänestyspoletti"
@@ -637,7 +657,7 @@ msgstr "
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: shared/common/kinds.py:3337
+#: shared/common/kinds.py:3299
 #, fuzzy
 msgid "Thing"
 msgstr "otsikko"
@@ -656,7 +676,7 @@ msgstr ""
 msgid "Translatable"
 msgstr "Kääntäjät"
 
-#: shared/common/kinds.py:3635 shared/common/kinds.py:3639
+#: shared/common/kinds.py:3597 shared/common/kinds.py:3601
 msgid "Creation Time"
 msgstr "Luotu"
 
@@ -678,7 +698,7 @@ msgstr ""
 msgid "Intersection"
 msgstr "Kääntäjät"
 
-#: shared/common/kinds.py:3680
+#: shared/common/kinds.py:3642
 #, fuzzy
 msgid "Token"
 msgstr "Äänipoletti"
@@ -711,7 +731,7 @@ msgstr "Mime-tyyppi"
 msgid "All Objects"
 msgstr "Kaikki kohteet"
 
-#: shared/common/kinds.py:2346
+#: shared/common/kinds.py:2308
 #, fuzzy
 msgid "Enter Twice"
 msgstr "Äänestäjien valinta"
@@ -721,7 +741,7 @@ msgstr "
 msgid "Theridion"
 msgstr "Versio:"
 
-#: shared/common/faults.py:475
+#: shared/common/faults.py:476
 #, fuzzy
 msgid "Winners group is not empty!"
 msgstr "Voittajien ryhmä"
@@ -744,7 +764,7 @@ msgstr "Ep
 msgid "Current Password"
 msgstr "Vaihda salasana"
 
-#: shared/web/kinds.py:425
+#: shared/web/kinds.py:418
 #, fuzzy
 msgid "Default Values"
 msgstr "Standardiryhmä"
@@ -781,7 +801,7 @@ msgid ""
 "document as you usually do."
 msgstr ""
 
-#: shared/common/kinds.py:2580
+#: shared/common/kinds.py:2542
 msgid "Minimum Number of Items"
 msgstr ""
 
@@ -789,8 +809,8 @@ msgstr ""
 msgid "Saint Lucia"
 msgstr ""
 
-#: shared/common/faults.py:264 shared/common/faults.py:272
-#: shared/common/faults.py:347
+#: shared/common/faults.py:265 shared/common/faults.py:273
+#: shared/common/faults.py:348
 msgid "Wrong value!"
 msgstr "Viallinen arvo!"
 
@@ -822,7 +842,7 @@ msgstr "GnuPG sormenj
 msgid "Find"
 msgstr "Haku"
 
-#: shared/web/ObjectsWeb.py:364 shared/web/VotesWeb.py:755
+#: shared/web/ObjectsWeb.py:368 shared/web/VotesWeb.py:755
 #: shared/web/modes.py:257
 #, fuzzy
 msgid "Editing %s - %s"
@@ -833,7 +853,7 @@ msgstr "Henkil
 msgid "All Label"
 msgstr "atomit"
 
-#: shared/web/tools.py:488
+#: shared/web/tools.py:431 shared/web/tools.py:481
 msgid "(missing item)"
 msgstr ""
 
@@ -854,12 +874,15 @@ msgstr ""
 msgid "Viet Nam"
 msgstr "Leveys"
 
-#: shared/common/CommentsCommon.py:78
-#, fuzzy
-msgid "Enter the title of your comment."
-msgstr "Viimeiset artikkelit"
+#: shared/web/geography.py:194
+msgid "Romania"
+msgstr ""
 
-#: shared/common/kinds.py:1557 shared/common/kinds.py:3809
+#: shared/web/ElectionsWeb.py:368
+msgid "blank vote"
+msgstr "tyhjä ääni"
+
+#: shared/common/kinds.py:1519 shared/common/kinds.py:3771
 #: shared/web/BrevesWeb.py:71
 msgid "Links"
 msgstr "Linkit"
@@ -878,7 +901,7 @@ msgstr "OK"
 msgid "DIV With Label"
 msgstr "atomit"
 
-#: shared/common/kinds.py:3955
+#: shared/common/kinds.py:3917
 msgid "Value Holder"
 msgstr ""
 
@@ -886,7 +909,7 @@ msgstr ""
 msgid "Jamaica"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:98
+#: shared/common/VirtualHostsCommon.py:158
 msgid "Enter the host name."
 msgstr ""
 
@@ -899,13 +922,12 @@ msgstr "Poista"
 msgid "New Zealand"
 msgstr "Uusi otsikko"
 
-#: shared/common/kinds.py:2484
+#: shared/common/kinds.py:2446
 msgid "Script"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:398
+#: shared/common/xhtmlgenerator.py:401
 #: shared/web/AuthenticationLoginPasswordWeb.py:384
-#: shared/web/AuthenticationLoginPasswordWeb.py:431
 msgid "Missing Object (%s)"
 msgstr ""
 
@@ -957,7 +979,7 @@ msgstr ""
 msgid "Congo, the Democratic Republic of the"
 msgstr ""
 
-#: shared/web/CommentsWeb.py:105
+#: shared/web/CommentsWeb.py:106
 msgid "Anonymous"
 msgstr ""
 
@@ -966,7 +988,7 @@ msgstr ""
 msgid "New Election"
 msgstr "äänestys"
 
-#: shared/common/kinds.py:1678
+#: shared/common/kinds.py:1640
 msgid "Minimum Value"
 msgstr ""
 
@@ -995,12 +1017,17 @@ msgstr "Lis
 msgid "Tonga"
 msgstr "Äänipoletti"
 
+#: profiles/comments.xml.in.h:1
+#, fuzzy
+msgid "Comments Support"
+msgstr "Kääntäjät"
+
 #: shared/web/ArticlesWeb.py:283
 msgid "DocBook Source - %s"
 msgstr "DocBook lähde - %s"
 
 #: shared/web/AuthenticationLoginPasswordWeb.py:359
-#: shared/web/AuthenticationLoginPasswordWeb.py:518
+#: shared/web/AuthenticationLoginPasswordWeb.py:515
 #, fuzzy
 msgid "The password has been sent successfully."
 msgstr "Salasana lähetetty osoitteeseen %s!"
@@ -1013,7 +1040,7 @@ msgstr "Ehdota vahvistukseen"
 msgid "Analyze"
 msgstr "Analyysi"
 
-#: shared/common/VirtualHostsCommon.py:56
+#: shared/common/VirtualHostsCommon.py:58
 #, fuzzy
 msgid "Select the default virtual host to use on this server"
 msgstr "Viimeiset hoidettavat tiedostot"
@@ -1038,11 +1065,11 @@ msgstr ""
 msgid "New Implementation"
 msgstr "Uusi järjestö"
 
-#: shared/common/faults.py:248
+#: shared/common/faults.py:249
 msgid "Specified path is not a file!"
 msgstr "Ilmoitettu hakutie ei osoita tiedostoa!"
 
-#: shared/common/kinds.py:2798
+#: shared/common/kinds.py:2760
 #, fuzzy
 msgid "Choose the user(s) of this object."
 msgstr "Päätettyjen äänestyksien äänet"
@@ -1130,7 +1157,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: shared/common/kinds.py:1687
+#: shared/common/kinds.py:1649
 msgid "Integer Number"
 msgstr ""
 
@@ -1175,7 +1202,7 @@ msgstr ""
 msgid "Member of groups"
 msgstr "Jäsenet"
 
-#: shared/common/kinds.py:3119
+#: shared/common/kinds.py:3081
 msgid "Server Role"
 msgstr ""
 
@@ -1184,15 +1211,15 @@ msgstr ""
 msgid "The account and the user card have been removed successfully."
 msgstr "Salasana lähetetty osoitteeseen %s!"
 
-#: shared/common/VirtualHostsCommon.py:84
+#: shared/common/VirtualHostsCommon.py:144
 msgid ""
 "Enter the Glasnost dispatcher id for this virtual host (you may have to "
 "consult your administrator)."
 msgstr ""
 
-#: shared/web/ElectionsWeb.py:368
-msgid "blank vote"
-msgstr "tyhjä ääni"
+#: templates/pel-infini/infos.xml.in.h:1
+msgid "infini (assoc brest)"
+msgstr ""
 
 #: shared/web/geography.py:166
 msgid "Mauritania"
@@ -1263,10 +1290,6 @@ msgstr ""
 msgid "Israel"
 msgstr ""
 
-#: shared/web/geography.py:228
-msgid "Uganda"
-msgstr ""
-
 #: shared/web/ElectionsWeb.py:350 shared/web/ElectionsWeb.py:366
 msgid "secret"
 msgstr "salainen"
@@ -1414,7 +1437,7 @@ msgstr "Standardiryhm
 msgid "Nicaragua"
 msgstr ""
 
-#: shared/web/UploadFilesWeb.py:352
+#: shared/web/UploadFilesWeb.py:355
 msgid "Your last files"
 msgstr "Viimeiset tiedostosi"
 
@@ -1431,7 +1454,7 @@ msgstr "K
 msgid "Public Ballot"
 msgstr "Avoin äänestyslippu"
 
-#: shared/web/ObjectsWeb.py:652
+#: shared/web/ObjectsWeb.py:660
 msgid "Id for \"%s\""
 msgstr ""
 
@@ -1439,7 +1462,7 @@ msgstr ""
 msgid "Heading"
 msgstr "Otsikko"
 
-#: shared/common/kinds.py:3161
+#: shared/common/kinds.py:3123
 #, fuzzy
 msgid "Slot Name"
 msgstr "Etunimi"
@@ -1449,7 +1472,7 @@ msgstr "Etunimi"
 msgid "New Alias"
 msgstr "Uusi"
 
-#: shared/common/kinds.py:3793
+#: shared/common/kinds.py:3755
 #, fuzzy
 msgid "Action"
 msgstr "äänestys"
@@ -1472,7 +1495,7 @@ msgstr "Uusi"
 msgid "Reverse Year Order?"
 msgstr ""
 
-#: shared/common/kinds.py:2741
+#: shared/common/kinds.py:2703
 msgid "Accepted Types"
 msgstr ""
 
@@ -1513,17 +1536,21 @@ msgstr "Saksa"
 msgid "Definition"
 msgstr "äänestys"
 
+#: profiles/ldap.xml.in.h:1
+msgid "LDAP Support"
+msgstr ""
+
 #: shared/common/CardsCommon.py:607
 #, fuzzy
 msgid "Card"
 msgstr "Luo"
 
-#: shared/common/kinds.py:2852 shared/common/kinds.py:2858
+#: shared/common/kinds.py:2814 shared/common/kinds.py:2820
 #, fuzzy
 msgid "Properties"
 msgstr "järjestöt"
 
-#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:365
+#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:368
 #: talTranslations.py:6
 msgid "Files"
 msgstr "Tiedostot"
@@ -1578,9 +1605,9 @@ msgstr ""
 msgid "Appointment"
 msgstr "Sisältö"
 
-#: shared/web/TranslationsWeb.py:125
-msgid "From "
-msgstr ""
+#: shared/web/ElectionsWeb.py:70
+msgid "Kind of Ballots"
+msgstr "Äänestyslippujen tyyppi"
 
 #: shared/web/TranslationsWeb.py:232
 #, fuzzy
@@ -1621,10 +1648,6 @@ msgstr "Viimeiset p
 msgid "Luxembourg"
 msgstr ""
 
-#: shared/web/geography.py:179
-msgid "Norway"
-msgstr ""
-
 #: shared/common/BrevesCommon.py:199
 #, fuzzy
 msgid "New Short Article"
@@ -1651,7 +1674,7 @@ msgstr ""
 msgid "Exclusive Choice"
 msgstr "Äänestäjien valinta"
 
-#: shared/common/CommentsCommon.py:101 shared/web/ElectionsWeb.py:316
+#: shared/common/CommentsCommon.py:103 shared/web/ElectionsWeb.py:316
 msgid "comment"
 msgstr "kommentti"
 
@@ -1682,7 +1705,7 @@ msgstr "Nimi"
 msgid "Malaysia"
 msgstr "Epäonnistui"
 
-#: shared/web/AppointmentsWeb.py:677 shared/web/widgets.py:612
+#: shared/web/AppointmentsWeb.py:680 shared/web/widgets.py:612
 msgid "Month"
 msgstr ""
 
@@ -1700,7 +1723,7 @@ msgstr ""
 msgid "The last system files to administer"
 msgstr "Viimeiset hoidettavat tiedostot"
 
-#: shared/common/faults.py:549
+#: shared/common/faults.py:550
 #, fuzzy
 msgid "Value too big!"
 msgstr "Arvo liian pieni!"
@@ -1714,6 +1737,11 @@ msgstr ""
 "<p>Ehdokas \"<i>%(candidate)s</i>\" voittaa kaikki muut ehdokkaat.</"
 "p><p>Ehdokas \"<i>%(candidate)s</i>\" voittaa äänestyksen.</p>"
 
+#: shared/common/CommentsCommon.py:75
+#, fuzzy
+msgid "Editorial Comment ?"
+msgstr "Kommentti"
+
 #: shared/common/ArticlesCommon.py:145
 #, fuzzy
 msgid "article"
@@ -1727,14 +1755,15 @@ msgstr ""
 msgid "Choose whether to crypt e-mails Glasnost sends to you."
 msgstr ""
 
-#: shared/common/kinds.py:1839
+#: shared/common/kinds.py:1801
 #, fuzzy
 msgid "Mapping"
 msgstr "Keskiarvo"
 
-#: templates/linuxdays/infos.xml.in.h:1
-msgid "Luxembourg LinuxDays"
-msgstr ""
+#: shared/common/VirtualHostsCommon.py:174
+#, fuzzy
+msgid "Usage Profiles"
+msgstr "järjestelmätiedostot"
 
 #: shared/web/geography.py:165
 msgid "Mongolia"
@@ -1805,7 +1834,7 @@ msgstr "J
 msgid "Version Number"
 msgstr "Versio:"
 
-#: shared/web/AppointmentsWeb.py:91
+#: shared/web/AppointmentsWeb.py:93
 msgid "Select the people and groups who are assigned to this appointment."
 msgstr ""
 
@@ -1836,6 +1865,14 @@ msgstr ""
 msgid "Table with One-on-One comparisons of the candidates"
 msgstr ""
 
+#: glasnost-web/siteMap.py:69
+msgid "Site Map"
+msgstr ""
+
+#: shared/common/xhtmlgenerator.py:62
+msgid "Abstain"
+msgstr "Luovuta"
+
 #: shared/web/TranslationsWeb.py:208
 msgid "Good"
 msgstr ""
@@ -1901,7 +1938,7 @@ msgstr "K
 msgid "Your elections being written"
 msgstr "Toimituksen alla olevat äänestyksesi"
 
-#: shared/web/AppointmentsWeb.py:210
+#: shared/web/AppointmentsWeb.py:212
 #, fuzzy
 msgid "Future events"
 msgstr "Vastaanottajat"
@@ -1993,7 +2030,7 @@ msgstr ""
 msgid "Monaco"
 msgstr "Yhteys"
 
-#: shared/common/kinds.py:3811
+#: shared/common/kinds.py:3773
 #, fuzzy
 msgid "Push Button"
 msgstr "Avoin äänestyslippu"
@@ -2024,7 +2061,7 @@ msgstr "Asetuksien editointi"
 msgid "Finnish"
 msgstr "Suomi"
 
-#: shared/common/kinds.py:2747
+#: shared/common/kinds.py:2709
 msgid "Accepted Roles"
 msgstr ""
 
@@ -2046,7 +2083,7 @@ msgstr ""
 msgid "Argentina"
 msgstr "Luovutus"
 
-#: shared/common/kinds.py:3781
+#: shared/common/kinds.py:3743
 #, fuzzy
 msgid "Extended Choice"
 msgstr "Äänestäjien valinta"
@@ -2066,7 +2103,7 @@ msgstr ""
 msgid "Others"
 msgstr "Äänestäjä"
 
-#: shared/web/AppointmentsWeb.py:635
+#: shared/web/AppointmentsWeb.py:638
 #, fuzzy
 msgid "Hour: %s - %s"
 msgstr "Henkilö - %s"
@@ -2075,7 +2112,7 @@ msgstr "Henkil
 msgid "Cuba"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:103
+#: shared/common/CommentsCommon.py:105
 #, fuzzy
 msgid "comments"
 msgstr "kommentti"
@@ -2110,7 +2147,7 @@ msgstr "
 msgid "Subject for the \"welcome\" email."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:775
+#: shared/web/ObjectsWeb.py:783
 #, fuzzy
 msgid "Search Results"
 msgstr "Tulokset"
@@ -2137,7 +2174,7 @@ msgstr ""
 msgid "Other Translations"
 msgstr "Kääntäjät"
 
-#: shared/common/VirtualHostsCommon.py:124
+#: shared/common/VirtualHostsCommon.py:218
 msgid "Template"
 msgstr ""
 
@@ -2164,8 +2201,7 @@ msgstr "Leveys"
 msgid "Malta"
 msgstr "tiedot"
 
-#: shared/common/CommentsCommon.py:104 shared/web/ObjectsWeb.py:1206
-#: shared/web/ObjectsWeb.py:1222
+#: shared/common/CommentsCommon.py:106 shared/web/CommentsWeb.py:163
 #, fuzzy
 msgid "Comments"
 msgstr "Kommentti"
@@ -2174,7 +2210,7 @@ msgstr "Kommentti"
 msgid "Registered Voters:"
 msgstr "Rekisteröityä äänestäjää:"
 
-#: shared/common/kinds.py:3578 shared/web/GroupsWeb.py:88
+#: shared/common/kinds.py:3540 shared/web/GroupsWeb.py:88
 #, fuzzy
 msgid "Union"
 msgstr "Tuntematon"
@@ -2195,7 +2231,7 @@ msgstr "j
 msgid "Select the author(s) of the document."
 msgstr ""
 
-#: shared/common/kinds.py:2816
+#: shared/common/kinds.py:2778
 #, fuzzy
 msgid "People Set"
 msgstr "Henkilöt"
@@ -2257,13 +2293,19 @@ msgstr "K
 msgid "Egypt"
 msgstr ""
 
+#: profiles/translations.xml.in.h:1
+#, fuzzy
+msgid "Translations Support"
+msgstr "Kääntäjät"
+
 #: shared/web/geography.py:121
 msgid "Honduras"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:62
-msgid "Abstain"
-msgstr "Luovuta"
+#: shared/web/AuthenticationLoginPasswordWeb.py:513
+#, fuzzy
+msgid "An error occured while sending the password."
+msgstr "Kääntäjät"
 
 #: shared/common/translation.py:66
 msgid "Portuguese"
@@ -2273,21 +2315,17 @@ msgstr ""
 msgid "The last system files"
 msgstr "Viimeiset järjestelmätiedostot"
 
-#: templates/pel-infini/infos.xml.in.h:1
-msgid "infini (assoc brest)"
-msgstr ""
-
 #: shared/web/PreferencesWeb.py:70
 msgid "Crypt Emails"
 msgstr "Kryptaa e-posti"
 
 #: shared/common/xhtmlgenerator.py:85
-#: shared/web/AuthenticationLoginPasswordWeb.py:496
+#: shared/web/AuthenticationLoginPasswordWeb.py:493
 #: shared/web/AuthenticationLdapWeb.py:124 talTranslations.py:14
 msgid "Login"
 msgstr "Liittymätunnus"
 
-#: shared/common/faults.py:225
+#: shared/common/faults.py:226
 msgid "Invalid email address"
 msgstr ""
 
@@ -2296,7 +2334,7 @@ msgstr ""
 msgid "Guyana"
 msgstr "Saksa"
 
-#: shared/common/kinds.py:3909 shared/common/modes.py:188
+#: shared/common/kinds.py:3871 shared/common/modes.py:188
 #, fuzzy
 msgid "Mode"
 msgstr "Äänestäjäpoletti"
@@ -2327,7 +2365,7 @@ msgstr "kohde"
 msgid "Button"
 msgstr "Avoin äänestyslippu"
 
-#: shared/common/kinds.py:3826
+#: shared/common/kinds.py:3788
 #, fuzzy
 msgid "Fault"
 msgstr "Epäonnistui"
@@ -2370,7 +2408,7 @@ msgstr ""
 msgid "View Aspect"
 msgstr "Ratkaisemattomat"
 
-#: shared/web/UploadFilesWeb.py:359
+#: shared/web/UploadFilesWeb.py:362
 msgid "The last files"
 msgstr "Viimeiset tiedostot"
 
@@ -2389,7 +2427,7 @@ msgstr ""
 msgid "Germany"
 msgstr "Saksa"
 
-#: shared/common/VirtualHostsCommon.py:121
+#: shared/common/VirtualHostsCommon.py:215
 msgid "Select the template (skin) to use for this host."
 msgstr ""
 
@@ -2416,7 +2454,7 @@ msgstr "Asetukset"
 msgid "April"
 msgstr "Artikkeli"
 
-#: shared/common/kinds.py:2812 shared/common/kinds.py:2818
+#: shared/common/kinds.py:2774 shared/common/kinds.py:2780
 #, fuzzy
 msgid "Users"
 msgstr "Käyttäjä:"
@@ -2453,7 +2491,7 @@ msgstr ""
 msgid "headings"
 msgstr "otsikot"
 
-#: shared/common/kinds.py:3771 shared/common/kinds.py:3773
+#: shared/common/kinds.py:3733 shared/common/kinds.py:3735
 msgid "Writers"
 msgstr "Editoijat"
 
@@ -2480,7 +2518,7 @@ msgstr "
 msgid "Winners Grading"
 msgstr "Voittajien sijoitus"
 
-#: shared/common/kinds.py:3314
+#: shared/common/kinds.py:3276
 #, fuzzy
 msgid "Access in View Mode"
 msgstr "Editointiaika"
@@ -2550,7 +2588,7 @@ msgstr "Lukijat"
 msgid "Header 6"
 msgstr "Lukijat"
 
-#: shared/common/faults.py:362
+#: shared/common/faults.py:363
 msgid "Missing value!"
 msgstr "Puuttuva arvo!"
 
@@ -2577,6 +2615,10 @@ msgstr "Lyhytuutinen"
 msgid "Enter the text of your comment."
 msgstr "Viimeiset artikkelit"
 
+#: templates/linuxdays/infos.xml.in.h:1
+msgid "Luxembourg LinuxDays"
+msgstr ""
+
 #: shared/web/geography.py:226
 msgid "Tanzania, United Republic of"
 msgstr ""
@@ -2611,7 +2653,7 @@ msgstr ""
 msgid "Are you sure you want to delete the %s \"%s\" ?"
 msgstr "Haluatko varmasti poistaa kohteen?"
 
-#: shared/common/kinds.py:3764
+#: shared/common/kinds.py:3726
 msgid "Select the people and groups who are allowed to modify the item."
 msgstr ""
 
@@ -2637,7 +2679,7 @@ msgstr ""
 msgid "Gambia"
 msgstr ""
 
-#: shared/common/kinds.py:1755 shared/common/kinds.py:1763
+#: shared/common/kinds.py:1717 shared/common/kinds.py:1725
 msgid "Language"
 msgstr "Kieli"
 
@@ -2659,9 +2701,9 @@ msgstr ""
 msgid "Blank Ballots:"
 msgstr "Tyhjiä äänilippuja:"
 
-#: shared/common/kinds.py:1103 shared/common/kinds.py:1761
-#: shared/common/kinds.py:2482 shared/common/kinds.py:2583
-#: shared/common/kinds.py:3945
+#: shared/common/kinds.py:1103 shared/common/kinds.py:1723
+#: shared/common/kinds.py:2444 shared/common/kinds.py:2545
+#: shared/common/kinds.py:3907
 #, fuzzy
 msgid "Data"
 msgstr "Tila"
@@ -2679,7 +2721,7 @@ msgid "Ties"
 msgstr "Ratkaisemattomat"
 
 #: shared/common/kinds.py:1315 shared/common/widgets.py:207
-#: shared/web/AppointmentsWeb.py:204 shared/web/AppointmentsWeb.py:216
+#: shared/web/AppointmentsWeb.py:206 shared/web/AppointmentsWeb.py:218
 #: shared/web/ArticlesWeb.py:323
 #, fuzzy
 msgid "Date"
@@ -2716,7 +2758,7 @@ msgstr "Uusi k
 msgid "Editing Translation"
 msgstr "Kääntäjät"
 
-#: shared/common/kinds.py:3800
+#: shared/common/kinds.py:3762
 #, fuzzy
 msgid "Next Mode"
 msgstr "Äänestäjäpoletti"
@@ -2751,12 +2793,12 @@ msgid ""
 "Please backup your changes and redo the edition."
 msgstr ""
 
-#: shared/common/CommentsCommon.py:99
+#: shared/common/CommentsCommon.py:101
 #, fuzzy
 msgid "New Comment"
 msgstr "Kommentti"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:469
+#: shared/web/AuthenticationLoginPasswordWeb.py:466
 #: shared/web/AuthenticationLdapWeb.py:99
 msgid "To access this part of the site, you need to sign in."
 msgstr ""
@@ -2770,12 +2812,12 @@ msgstr "K
 msgid "xOctober"
 msgstr "Äänestäjä"
 
-#: shared/web/AppointmentsWeb.py:93
+#: shared/web/AppointmentsWeb.py:95
 #, fuzzy
 msgid "Participants"
 msgstr "artikkelit"
 
-#: shared/web/AppointmentsWeb.py:95
+#: shared/web/AppointmentsWeb.py:97
 #, fuzzy
 msgid "Start"
 msgstr "Tila"
@@ -2793,9 +2835,9 @@ msgstr "Editointiaika"
 msgid "Dominica"
 msgstr ""
 
-#: shared/web/VotesWeb.py:373
-msgid "Voter"
-msgstr "Äänestäjä"
+#: shared/web/TranslationsWeb.py:125
+msgid "From "
+msgstr ""
 
 #: shared/common/VotesCommon.py:372 shared/web/ElectionsWeb.py:284
 #: shared/web/VotesWeb.py:914
@@ -2810,7 +2852,7 @@ msgstr ""
 msgid "(%d words)"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:238
+#: shared/web/AppointmentsWeb.py:240
 #, fuzzy
 msgid "Day long appointments"
 msgstr "Sisältö"
@@ -2832,10 +2874,9 @@ msgstr ""
 msgid "Minimum Year Value Difference to Now"
 msgstr ""
 
-#: shared/common/kinds.py:3805
-#, fuzzy
-msgid "Next Object"
-msgstr "Kohde"
+#: shared/web/geography.py:228
+msgid "Uganda"
+msgstr ""
 
 #: shared/common/RubricsCommon.py:114
 msgid "Headings"
@@ -2849,7 +2890,7 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#: shared/common/kinds.py:2573
+#: shared/common/kinds.py:2535
 #, fuzzy
 msgid "Item Type"
 msgstr "Mime-tyyppi"
@@ -2879,7 +2920,7 @@ msgstr "Henkil
 msgid "Chad"
 msgstr "Luo"
 
-#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:90
+#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:150
 #, fuzzy
 msgid "Glasnost Dispatcher ID"
 msgstr "Lataa"
@@ -2958,12 +2999,12 @@ msgstr "L
 msgid "Bolivia"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:248 shared/common/widgets.py:154
+#: shared/common/xhtmlgenerator.py:251 shared/common/widgets.py:154
 #: shared/common/widgets.py:358 shared/web/widgets.py:506
 msgid "None"
 msgstr "Ei yksikään"
 
-#: shared/common/kinds.py:2472
+#: shared/common/kinds.py:2434
 #, fuzzy
 msgid "Source Code"
 msgstr "Katso lähdekoodi"
@@ -3006,7 +3047,7 @@ msgid ""
 "be displayed."
 msgstr ""
 
-#: shared/common/faults.py:541
+#: shared/common/faults.py:542
 msgid "Value too small!"
 msgstr "Arvo liian pieni!"
 
@@ -3014,6 +3055,10 @@ msgstr "Arvo liian pieni!"
 msgid "Link Entry Field"
 msgstr ""
 
+#: profiles/cms.xml.in.h:1
+msgid "Content Management System"
+msgstr ""
+
 #: shared/web/geography.py:178
 msgid "Netherlands"
 msgstr ""
@@ -3032,13 +3077,8 @@ msgstr ""
 msgid "Evaluate"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:516
-#, fuzzy
-msgid "An error occured while sending the password."
-msgstr "Kääntäjät"
-
-#: shared/web/geography.py:194
-msgid "Romania"
+#: shared/web/geography.py:77
+msgid "Belarus"
 msgstr ""
 
 #: shared/web/geography.py:176
@@ -3060,7 +3100,7 @@ msgstr "K
 msgid "Benin"
 msgstr ""
 
-#: shared/common/kinds.py:2373
+#: shared/common/kinds.py:2335
 msgid "Python Identifier"
 msgstr ""
 
@@ -3130,11 +3170,11 @@ msgstr ""
 msgid "Multi-Line Field"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:247
+#: shared/common/VirtualHostsCommon.py:341
 msgid "Virtual Host"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:88
+#: shared/web/AppointmentsWeb.py:90
 #, fuzzy
 msgid "End"
 msgstr "Päättynyt"
@@ -3166,11 +3206,6 @@ msgstr ""
 msgid "Kenya"
 msgstr "Ei koskaan"
 
-#: shared/common/kinds.py:1517
-#, fuzzy
-msgid "Function Name"
-msgstr "Etunimi"
-
 #: shared/web/geography.py:152
 msgid "Lesotho"
 msgstr ""
@@ -3183,7 +3218,7 @@ msgstr ""
 msgid "Best Average"
 msgstr "Paras keskiarvo"
 
-#: shared/common/kinds.py:3865
+#: shared/common/kinds.py:3827
 #, fuzzy
 msgid "Kind Name"
 msgstr "Etunimi"
@@ -3207,7 +3242,7 @@ msgid ""
 "items."
 msgstr ""
 
-#: shared/common/BrevesCommon.py:204 shared/web/tools.py:627
+#: shared/common/BrevesCommon.py:204 shared/web/tools.py:616
 #: shared/web/BrevesWeb.py:168 talTranslations.py:17
 msgid "Short News"
 msgstr "Lyhytuutiset"
@@ -3239,7 +3274,7 @@ msgstr ""
 msgid "The election \"%s\""
 msgstr "Äänestys \"%s\""
 
-#: shared/web/AppointmentsWeb.py:225 shared/web/AppointmentsWeb.py:683
+#: shared/web/AppointmentsWeb.py:227 shared/web/AppointmentsWeb.py:686
 #, fuzzy
 msgid "Agenda"
 msgstr "Lukija"
@@ -3360,7 +3395,7 @@ msgstr ""
 msgid "Authentication (LDAP)"
 msgstr "Luovutus"
 
-#: shared/common/VirtualHostsCommon.py:248
+#: shared/common/VirtualHostsCommon.py:342
 msgid "virtual hosts"
 msgstr ""
 
@@ -3368,7 +3403,7 @@ msgstr ""
 msgid "group"
 msgstr "ryhmä"
 
-#: shared/common/kinds.py:436 shared/common/kinds.py:3966
+#: shared/common/kinds.py:436 shared/common/kinds.py:3928
 #: shared/common/xhtmlgenerator.py:114 shared/common/modes.py:141
 #: shared/common/widgets.py:80 shared/common/widgets.py:84
 #, fuzzy
@@ -3384,7 +3419,7 @@ msgstr "Arvoj
 msgid "New Forum"
 msgstr "Uusi Atomi"
 
-#: shared/web/AppointmentsWeb.py:57
+#: shared/web/AppointmentsWeb.py:59
 #, fuzzy
 msgid "Categories Group"
 msgstr "Voittajien ryhmä"
@@ -3448,7 +3483,7 @@ msgstr ""
 msgid "Author"
 msgstr "Luoja"
 
-#: shared/common/VirtualHostsCommon.py:246
+#: shared/common/VirtualHostsCommon.py:340
 msgid "virtual host"
 msgstr ""
 
@@ -3461,7 +3496,7 @@ msgstr "K
 msgid "Sao Tome and Principe"
 msgstr ""
 
-#: shared/common/kinds.py:2826
+#: shared/common/kinds.py:2788
 msgid "Choose the author(s) for this object."
 msgstr ""
 
@@ -3473,12 +3508,17 @@ msgstr "K
 msgid "Public Ballots"
 msgstr "Avoimet ääniliput"
 
-#: shared/common/kinds.py:3946 shared/common/UploadFilesCommon.py:135
+#: shared/common/kinds.py:3908 shared/common/UploadFilesCommon.py:135
 #: shared/common/uploads.py:74 shared/web/UploadFilesWeb.py:77
 #: shared/web/uploads.py:67
 msgid "File"
 msgstr "Tiedosto"
 
+#: shared/common/kinds.py:3812 shared/common/values.py:53
+#, fuzzy
+msgid "Kind"
+msgstr "Haku"
+
 #: shared/common/kinds.py:1267 shared/common/kinds.py:1269
 #, fuzzy
 msgid "Date & Time"
@@ -3492,7 +3532,7 @@ msgstr "P
 msgid "Enter the name of this heading."
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:678 shared/web/widgets.py:598
+#: shared/web/AppointmentsWeb.py:681 shared/web/widgets.py:598
 #, fuzzy
 msgid "Year"
 msgstr "Lukija"
@@ -3503,7 +3543,7 @@ msgstr "Tulokset"
 
 #: shared/common/xhtmlgenerator.py:90
 #: shared/web/AuthenticationLoginPasswordWeb.py:371
-#: shared/web/AuthenticationLoginPasswordWeb.py:576
+#: shared/web/AuthenticationLoginPasswordWeb.py:573
 msgid "New Account"
 msgstr "Uusi käyttäjätili"
 
@@ -3560,7 +3600,7 @@ msgstr ""
 msgid "Alias"
 msgstr ""
 
-#: shared/common/kinds.py:3276
+#: shared/common/kinds.py:3238
 #, fuzzy
 msgid "Access in Creation Mode"
 msgstr "Luotu"
@@ -3589,7 +3629,7 @@ msgstr "Ep
 msgid "Eritrea"
 msgstr "Editoija"
 
-#: shared/common/kinds.py:2462
+#: shared/common/kinds.py:2424
 msgid "Execute On Display"
 msgstr ""
 
@@ -3653,7 +3693,7 @@ msgstr ""
 msgid "Format"
 msgstr "Muoto"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:611
+#: shared/web/AuthenticationLoginPasswordWeb.py:608
 msgid ""
 "The account has successfully been created, but a SMTP error has occurred.\n"
 "Maybe the Mail Transport Agent on the Glasnost server is badly configured."
@@ -3682,7 +3722,7 @@ msgstr "Uusi henkil
 msgid "Suriname"
 msgstr "Lempinimi"
 
-#: shared/common/VirtualHostsCommon.py:58
+#: shared/common/VirtualHostsCommon.py:60
 #, fuzzy
 msgid "Default Virtual Host"
 msgstr "Ääni - %s"
@@ -3700,7 +3740,7 @@ msgstr "
 msgid "State"
 msgstr "Tila"
 
-#: shared/common/kinds.py:2727
+#: shared/common/kinds.py:2689
 #, fuzzy
 msgid "Select accepted types of items."
 msgstr "Valitse lisättävä ehdokas"
@@ -3713,7 +3753,7 @@ msgstr ""
 msgid "Administrators"
 msgstr "Ylläpitäjät"
 
-#: shared/common/faults.py:240
+#: shared/common/faults.py:241
 msgid "Specified file path does not exist!"
 msgstr "Ilmoitettua hakutietä ei ole olemassa!"
 
@@ -3758,7 +3798,7 @@ msgstr ""
 "%s\n"
 
 #: shared/common/kinds.py:980 shared/common/kinds.py:1487
-#: shared/common/kinds.py:1685
+#: shared/common/kinds.py:1647
 #, fuzzy
 msgid "Numbers"
 msgstr "Ei-jäsen"
@@ -3795,8 +3835,8 @@ msgstr ""
 
 #: shared/common/ArticlesCommon.py:64 shared/common/kinds.py:378
 #: shared/common/kinds.py:1372 shared/common/kinds.py:1454
-#: shared/common/kinds.py:2353 shared/common/kinds.py:3206
-#: shared/common/kinds.py:3208 shared/web/AppointmentsWeb.py:64
+#: shared/common/kinds.py:2315 shared/common/kinds.py:3168
+#: shared/common/kinds.py:3170 shared/web/AppointmentsWeb.py:66
 #: shared/web/BrevesWeb.py:63 shared/web/CommentsWeb.py:62
 #: shared/web/ArticlesWeb.py:78
 msgid "Text"
@@ -3811,7 +3851,7 @@ msgstr "Saksa"
 msgid "hour"
 msgstr "Luoja"
 
-#: shared/common/faults.py:133
+#: shared/common/faults.py:134
 #, fuzzy
 msgid "Unknown error"
 msgstr "Tuntematon"
@@ -3834,7 +3874,7 @@ msgstr ""
 msgid "Text Format"
 msgstr "Muoto"
 
-#: shared/common/kinds.py:1674
+#: shared/common/kinds.py:1636
 #, fuzzy
 msgid "Maximum Value"
 msgstr "Standardiryhmä"
@@ -3897,8 +3937,8 @@ msgstr ""
 msgid "Denmark"
 msgstr ""
 
-#: shared/common/kinds.py:3279 shared/common/kinds.py:3298
-#: shared/common/kinds.py:3316
+#: shared/common/kinds.py:3241 shared/common/kinds.py:3260
+#: shared/common/kinds.py:3278
 #, fuzzy
 msgid "Embedded"
 msgstr "Päättynyt"
@@ -3930,7 +3970,7 @@ msgstr "SPIP"
 msgid "\"%s\" ImplementationsreadLanguages"
 msgstr ""
 
-#: shared/common/kinds.py:2923
+#: shared/common/kinds.py:2885
 msgid "Select the people and groups who are allowed to read the item."
 msgstr ""
 
@@ -3970,10 +4010,15 @@ msgstr "Katso erot"
 msgid "short article"
 msgstr "Lyhytuutinen"
 
-#: shared/common/kinds.py:2563
+#: shared/common/kinds.py:2525
 msgid "Minimum Number of Items to Edit"
 msgstr ""
 
+#: profiles/vote.xml.in.h:1
+#, fuzzy
+msgid "Electronic Voting"
+msgstr "Äänestyksen kesto"
+
 #: shared/common/kinds.py:1488
 msgid "Float Number"
 msgstr ""
@@ -4026,8 +4071,8 @@ msgstr "Poistu"
 msgid "Re-enter your new password."
 msgstr ""
 
-#: shared/common/kinds.py:1783 shared/common/kinds.py:3280
-#: shared/common/kinds.py:3299 shared/common/kinds.py:3317
+#: shared/common/kinds.py:1745 shared/common/kinds.py:3242
+#: shared/common/kinds.py:3261 shared/common/kinds.py:3279
 msgid "Link"
 msgstr "Linkki"
 
@@ -4051,7 +4096,7 @@ msgstr ""
 msgid "CRANS"
 msgstr ""
 
-#: shared/common/kinds.py:2930 shared/common/kinds.py:2932
+#: shared/common/kinds.py:2892 shared/common/kinds.py:2894
 msgid "Readers"
 msgstr "Lukijat"
 
@@ -4102,7 +4147,7 @@ msgstr ""
 msgid "Enter your email address."
 msgstr ""
 
-#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1310
+#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1309
 msgid " (at <%s>)"
 msgstr ""
 
@@ -4131,7 +4176,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: shared/common/faults.py:256
+#: shared/common/faults.py:257
 #, fuzzy
 msgid "Access to file is denied!"
 msgstr "Pääsy kielletty!"
@@ -4140,7 +4185,7 @@ msgstr "P
 msgid "Singapore"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:101
+#: shared/common/VirtualHostsCommon.py:161
 #, fuzzy
 msgid "Web Host Name"
 msgstr "Sukunimi"
@@ -4188,7 +4233,7 @@ msgstr ""
 "<p>Ehdokkailla <i>%(candidates)s</i> on parhaat keskiarvot.</p><p>Ehdokkaat %"
 "(candidates)s voittavat äänestyksen.</p>"
 
-#: shared/common/kinds.py:3573 shared/web/GroupsWeb.py:114
+#: shared/common/kinds.py:3535 shared/web/GroupsWeb.py:114
 msgid "Items"
 msgstr "Yksiköt"
 
@@ -4210,7 +4255,7 @@ msgstr ""
 "<p>Ehdokkaalla \"<i>%(candidate)s</i>\" on paras keskiarvo.</p><p>Ehdokas "
 "\"<i>%(candidate)s</i>\" voittaa äänestyksen.</p>"
 
-#: shared/web/AppointmentsWeb.py:75
+#: shared/web/AppointmentsWeb.py:77
 #, fuzzy
 msgid "Categories"
 msgstr "Luku"
@@ -4220,7 +4265,7 @@ msgid "True"
 msgstr ""
 
 #: shared/common/TranslationsCommon.py:138 shared/web/TranslationsWeb.py:174
-#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:900
+#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:908
 #, fuzzy
 msgid "Translation"
 msgstr "Kääntäjät"
@@ -4229,16 +4274,16 @@ msgstr "K
 msgid "Entrouvert.com"
 msgstr ""
 
-#: shared/common/kinds.py:3090
+#: shared/common/kinds.py:3052
 #, fuzzy
 msgid "Glasnost Server ID"
 msgstr "Lataa"
 
-#: shared/common/kinds.py:3664 shared/common/kinds.py:3668
+#: shared/common/kinds.py:3626 shared/common/kinds.py:3630
 msgid "Modification Time"
 msgstr "Editointiaika"
 
-#: shared/web/AppointmentsWeb.py:222
+#: shared/web/AppointmentsWeb.py:224
 #, fuzzy
 msgid "Past events"
 msgstr "Vastaanottajat"
@@ -4247,7 +4292,7 @@ msgstr "Vastaanottajat"
 msgid "HTML"
 msgstr ""
 
-#: shared/common/kinds.py:3296
+#: shared/common/kinds.py:3258
 #, fuzzy
 msgid "Access in Edition Mode"
 msgstr "Editointiaika"
@@ -4280,7 +4325,12 @@ msgstr "GnuPG sormenj
 msgid "preferences"
 msgstr "asetukset"
 
-#: shared/web/widgets.py:1871
+#: shared/common/xhtmlgenerator.py:92
+#, fuzzy
+msgid "Pester Absentionnists"
+msgstr "Luopuneita:"
+
+#: shared/web/widgets.py:1890
 #, fuzzy
 msgid "other:"
 msgstr "Äänestäjää:"
@@ -4289,15 +4339,15 @@ msgstr "
 msgid "vote"
 msgstr "ääni"
 
-#: shared/web/ElectionsWeb.py:70
-msgid "Kind of Ballots"
-msgstr "Äänestyslippujen tyyppi"
+#: shared/web/geography.py:179
+msgid "Norway"
+msgstr ""
 
 #: shared/web/TranslationsWeb.py:252
 msgid "Translators"
 msgstr "Kääntäjät"
 
-#: shared/web/widgets.py:1739
+#: shared/web/widgets.py:1755
 msgid "download"
 msgstr ""
 
@@ -4318,8 +4368,8 @@ msgstr ""
 msgid "Single-Line Text Entry Field"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:205 shared/web/AppointmentsWeb.py:217
-#: shared/web/widgets.py:1872
+#: shared/web/AppointmentsWeb.py:207 shared/web/AppointmentsWeb.py:219
+#: shared/web/widgets.py:1891
 msgid "Label"
 msgstr ""
 
@@ -4365,10 +4415,10 @@ msgstr "Valitse lis
 msgid "Select the front article of this heading."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:1194
+#: shared/common/kinds.py:3767
 #, fuzzy
-msgid "No comment."
-msgstr "kommentti"
+msgid "Next Object"
+msgstr "Kohde"
 
 #: shared/common/modes.py:219
 #, fuzzy
@@ -4393,7 +4443,7 @@ msgstr ""
 msgid "Edition Aspect"
 msgstr "Editointiaika"
 
-#: shared/common/kinds.py:2366
+#: shared/common/kinds.py:2328
 msgid "Invalid values"
 msgstr ""
 
@@ -4402,7 +4452,7 @@ msgstr ""
 msgid "minute"
 msgstr "Ei-jäsen"
 
-#: shared/web/AppointmentsWeb.py:675
+#: shared/web/AppointmentsWeb.py:678
 msgid "Week"
 msgstr ""
 
@@ -4471,7 +4521,7 @@ msgstr "Sis
 msgid "Choose the candidates for this election."
 msgstr "Päätettyjen äänestyksien äänet"
 
-#: shared/web/AppointmentsWeb.py:673 shared/web/widgets.py:628
+#: shared/web/AppointmentsWeb.py:676 shared/web/widgets.py:628
 msgid "Day"
 msgstr ""
 
@@ -4502,7 +4552,7 @@ msgstr "Ehdokas"
 msgid "Creation Aspect"
 msgstr "Luotu"
 
-#: shared/common/kinds.py:1559 shared/common/ObjectsCommon.py:215
+#: shared/common/kinds.py:1521 shared/common/ObjectsCommon.py:215
 msgid "Object"
 msgstr "Kohde"
 
@@ -4579,10 +4629,10 @@ msgstr ""
 msgid "Election in progress"
 msgstr "Meneillä oleva äänestys"
 
-#: shared/common/kinds.py:3850 shared/common/values.py:53
+#: shared/web/CommentsWeb.py:156
 #, fuzzy
-msgid "Kind"
-msgstr "Haku"
+msgid "Editorial Comments"
+msgstr "Kommentti"
 
 #: shared/common/widgets.py:274
 #, fuzzy
@@ -4602,20 +4652,20 @@ msgstr ""
 msgid "Somalia"
 msgstr "Epäonnistui"
 
-#: shared/web/tools.py:633
+#: shared/web/tools.py:622
 #, fuzzy
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: shared/common/VirtualHostsCommon.py:149 shared/web/AppointmentsWeb.py:97
+#: shared/common/VirtualHostsCommon.py:243 shared/web/AppointmentsWeb.py:99
 #: shared/web/ElectionsWeb.py:128 shared/web/BrevesWeb.py:73
-#: shared/web/CommentsWeb.py:69 shared/web/ForumsWeb.py:71
-#: shared/web/UploadFilesWeb.py:107 shared/web/widgets.py:932
-#: shared/web/ArticlesWeb.py:87 shared/web/SystemFilesWeb.py:82
+#: shared/web/ForumsWeb.py:71 shared/web/UploadFilesWeb.py:107
+#: shared/web/widgets.py:932 shared/web/ArticlesWeb.py:87
+#: shared/web/SystemFilesWeb.py:82
 msgid "Title"
 msgstr "Nimi"
 
-#: shared/common/kinds.py:2838 shared/common/kinds.py:2840
+#: shared/common/kinds.py:2800 shared/common/kinds.py:2802
 msgid "Authors"
 msgstr "Luonut"
 
@@ -4637,6 +4687,14 @@ msgstr ""
 msgid "Canada"
 msgstr "Ehdokas"
 
+#, fuzzy
+#~ msgid "Enter the title of your comment."
+#~ msgstr "Viimeiset artikkelit"
+
+#, fuzzy
+#~ msgid "Function Name"
+#~ msgstr "Etunimi"
+
 #~ msgid "Can't change value!"
 #~ msgstr "Arvon muuttaminen mahdotonta!"
 
@@ -5052,10 +5110,6 @@ msgstr "Ehdokas"
 #~ msgid "New Organization"
 #~ msgstr "Kääntäjät"
 
-#, fuzzy
-#~ msgid "Function Calls"
-#~ msgstr "Soitettu puhelu"
-
 #~ msgid "The sending of the password by email to %s has failed!"
 #~ msgstr "Salasanan lähettäminen osoitteeseen %s epäonnistui!"
 
diff --git a/po/glasnost-web/fr.po b/po/glasnost-web/fr.po
index 8fa1a54c..643aec40 100644
--- a/po/glasnost-web/fr.po
+++ b/po/glasnost-web/fr.po
@@ -25,7 +25,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glasnost-web $Revision$\n"
-"POT-Creation-Date: Thu Nov  6 13:19:42 2003\n"
+"POT-Creation-Date: Tue Nov 18 16:12:53 2003\n"
 "PO-Revision-Date: 2003-10-06 01:03+0200\n"
 "Last-Translator: Frédéric Péters <fpeters@entrouvert.be>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -37,11 +37,11 @@ msgstr ""
 msgid "in3activa"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:249
+#: shared/common/VirtualHostsCommon.py:343
 msgid "Virtual Hosts"
 msgstr "Hôtes virtuels"
 
-#: shared/common/kinds.py:1742
+#: shared/common/kinds.py:1704
 msgid "Integer Choice"
 msgstr "Liste à valeurs entières"
 
@@ -85,7 +85,7 @@ msgstr "Azerba
 msgid "New Translation"
 msgstr "Nouvelle traduction"
 
-#: shared/common/kinds.py:2585
+#: shared/common/kinds.py:2547
 msgid "Sequence"
 msgstr "Suite"
 
@@ -97,9 +97,9 @@ msgstr "Vous n'
 msgid "Secret Ballot"
 msgstr "Bulletin secret"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:249
-msgid "Changing User Password"
-msgstr "Changer le mot de passe d'un utilisateur"
+#: shared/common/CommentsCommon.py:86
+msgid "some comment"
+msgstr "un commentaire"
 
 #: shared/common/ElectionsCommon.py:144
 msgid "Choose the persons or groups who will vote for this election."
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Cyprus"
 msgstr "Chypre"
 
-#: shared/common/kinds.py:222 shared/common/kinds.py:3278
+#: shared/common/kinds.py:222 shared/common/kinds.py:3240
 msgid "Same As Edition Mode"
 msgstr "Identique au mode d'édition"
 
@@ -123,11 +123,11 @@ msgstr "xnovembre"
 msgid "Check Box"
 msgstr "Case à cocher"
 
-#: shared/common/kinds.py:2467
+#: shared/common/kinds.py:2429
 msgid "Execute On Submit"
 msgstr ""
 
-#: shared/common/kinds.py:3703
+#: shared/common/kinds.py:3665
 msgid "User Token"
 msgstr "Jeton d'utilisateur"
 
@@ -148,6 +148,10 @@ msgstr "
 msgid "New Heading"
 msgstr "Nouvelle rubrique"
 
+#: shared/web/AuthenticationLoginPasswordWeb.py:249
+msgid "Changing User Password"
+msgstr "Changer le mot de passe d'un utilisateur"
+
 #: shared/web/calendaring.py:60
 msgid "February"
 msgstr "Février"
@@ -156,7 +160,7 @@ msgstr "F
 msgid "Liberia"
 msgstr "Liberia"
 
-#: shared/common/kinds.py:3253
+#: shared/common/kinds.py:3215
 msgid "Structure"
 msgstr "Structure"
 
@@ -165,7 +169,7 @@ msgid "Saint Kitts and Nevis"
 msgstr "Saint-Christophe-et-Niévès"
 
 #: shared/common/AuthenticationLoginPasswordCommon.py:64
-#: shared/common/kinds.py:2355 shared/common/AuthenticationLdapCommon.py:63
+#: shared/common/kinds.py:2317 shared/common/AuthenticationLdapCommon.py:63
 #: shared/web/AuthenticationLoginPasswordWeb.py:69
 #: shared/web/AuthenticationLoginPasswordWeb.py:146
 msgid "Password"
@@ -211,13 +215,13 @@ msgstr "Erreur 
 msgid "Counting of the Votes"
 msgstr "Dépouillement des votes"
 
-#: shared/common/kinds.py:2536
+#: shared/common/kinds.py:2498
 msgid "Script Source Code"
 msgstr ""
 
-#: shared/web/geography.py:65
-msgid "Burkina Faso"
-msgstr "Burkina"
+#: shared/web/VotesWeb.py:373
+msgid "Voter"
+msgstr "Électeur"
 
 #: shared/common/kinds.py:97
 msgid "Containers"
@@ -236,7 +240,6 @@ msgid "Thursday"
 msgstr "Jeudi"
 
 #: templates/glasnost/infos.xml.in.h:1
-#, fuzzy
 msgid "Glasnost"
 msgstr "Glasnost"
 
@@ -281,11 +284,11 @@ msgstr "Navigation"
 msgid "Add %s To Rubric"
 msgstr ""
 
-#: shared/web/GlasnostTALInterpreter.py:64
+#: shared/web/GlasnostTALInterpreter.py:67
 msgid "Error in generated HTML"
 msgstr ""
 
-#: shared/common/kinds.py:1749
+#: shared/common/kinds.py:1711
 msgid "Select the language used to fill in this card."
 msgstr "Choisissez la langue utilisée pour compléter cette fiche."
 
@@ -368,10 +371,14 @@ msgstr "Calculer"
 msgid "files"
 msgstr "fichiers"
 
-#: shared/common/kinds.py:3980
+#: shared/common/kinds.py:3942
 msgid "Widget Name"
 msgstr "Nom du composant graphique"
 
+#: shared/web/CommentsWeb.py:168
+msgid "Add Comment"
+msgstr "Ajouter un commentaire"
+
 #: shared/web/TranslationsWeb.py:165 shared/web/TranslationsWeb.py:612
 #: shared/web/GradesWeb.py:85 shared/web/widgets.py:152
 #: shared/web/widgets.py:932 shared/web/widgets.py:938
@@ -400,14 +407,18 @@ msgstr "Utilisateur"
 msgid "Vote Blank"
 msgstr "Voter blanc"
 
+#: profiles/basic.xml.in.h:1
+msgid "Basic Functionalities"
+msgstr "Fonctionnalités de base"
+
 #: shared/web/AuthenticationLoginPasswordWeb.py:302
 msgid "Delete Account"
 msgstr "Supprimer le compte"
 
-#: shared/common/faults.py:324 shared/common/faults.py:486
-#: shared/common/faults.py:494 shared/common/faults.py:502
-#: shared/common/faults.py:510 shared/common/faults.py:518
-#: shared/common/faults.py:526
+#: shared/common/faults.py:325 shared/common/faults.py:487
+#: shared/common/faults.py:495 shared/common/faults.py:503
+#: shared/common/faults.py:511 shared/common/faults.py:519
+#: shared/common/faults.py:527
 msgid "Value already used!"
 msgstr "Valeur déjà utilisée !"
 
@@ -423,11 +434,11 @@ msgstr "Ann
 msgid "Editing %s Settings"
 msgstr "Édition des réglages des %s"
 
-#: shared/web/geography.py:77
-msgid "Belarus"
-msgstr "Biélorussie"
+#: shared/web/geography.py:65
+msgid "Burkina Faso"
+msgstr "Burkina"
 
-#: shared/web/AppointmentsWeb.py:344
+#: shared/web/AppointmentsWeb.py:346
 msgid "Week %d of %d"
 msgstr "Semaine %d de %d"
 
@@ -447,7 +458,7 @@ msgstr "Aide syst
 msgid "Secret Ballots"
 msgstr "Bulletins secrets"
 
-#: shared/web/tools.py:574
+#: shared/web/tools.py:567
 msgid "Success"
 msgstr "Succès"
 
@@ -467,11 +478,11 @@ msgstr "Dupliquer"
 msgid "Weightings"
 msgstr "Pondérations"
 
-#: shared/common/VirtualHostsCommon.py:147
+#: shared/common/VirtualHostsCommon.py:241
 msgid "Enter the title of this virtual host."
 msgstr "Entrez le titre de cet hôte virtuel."
 
-#: shared/common/VirtualHostsCommon.py:244
+#: shared/common/VirtualHostsCommon.py:338
 msgid "New Virtual Host"
 msgstr "Nouvel hôte virtuel"
 
@@ -488,6 +499,10 @@ msgstr "Authentification (Liberty Alliance)"
 msgid "Select the items to subtract."
 msgstr "Sélectionnez le fichier à télécharger."
 
+#: profiles/cards.xml.in.h:1
+msgid "Cards Support"
+msgstr "Support pour les fiches"
+
 #: shared/common/xhtmlgenerator.py:107
 msgid "Use"
 msgstr "Utilisation"
@@ -560,15 +575,16 @@ msgstr "Traduction vers %s"
 msgid "Read the License"
 msgstr "Lire la licence"
 
-#: shared/common/xhtmlgenerator.py:92
-msgid "Pester Absentionnists"
-msgstr "Relancer les abstentionnistes"
+#: shared/common/faults.py:558
+#, fuzzy
+msgid "Role not in profiles"
+msgstr "Élection en cours"
 
 #: shared/web/TranslationsWeb.py:550 shared/web/TranslationsWeb.py:564
 msgid "%(from)s to %(to)s"
 msgstr "%(from)s vers %(to)s"
 
-#: shared/common/CommentsCommon.py:102 shared/web/UploadFilesWeb.py:71
+#: shared/common/CommentsCommon.py:104 shared/web/UploadFilesWeb.py:71
 #: shared/web/VotesWeb.py:335
 msgid "Comment"
 msgstr "Commentaire"
@@ -585,12 +601,11 @@ msgstr "Supprimer le compte et la fiche utilisateur ?"
 msgid "History - %s"
 msgstr "Historique - %s"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:439
-#, fuzzy
+#: shared/web/AuthenticationLoginPasswordWeb.py:436
 msgid "Create Account for user:"
-msgstr "Supprimer le compte:"
+msgstr "Créer un compte pour l'utilisateur:"
 
-#: shared/common/kinds.py:3696
+#: shared/common/kinds.py:3658
 msgid "Application Token"
 msgstr "Jeton d'application"
 
@@ -598,14 +613,13 @@ msgstr "Jeton d'application"
 msgid "Sweden"
 msgstr "Suède"
 
-#: shared/common/kinds.py:3337
+#: shared/common/kinds.py:3299
 msgid "Thing"
 msgstr "Chose"
 
 #: shared/common/modes.py:196
-#, fuzzy
 msgid "Untitled"
-msgstr "Titre"
+msgstr "Sans titre"
 
 #: templates/rap/infos.xml.in.h:1
 msgid "R.A.P. Belgique"
@@ -615,7 +629,7 @@ msgstr ""
 msgid "Translatable"
 msgstr "Traduisible"
 
-#: shared/common/kinds.py:3635 shared/common/kinds.py:3639
+#: shared/common/kinds.py:3597 shared/common/kinds.py:3601
 msgid "Creation Time"
 msgstr "Date de création"
 
@@ -632,11 +646,10 @@ msgid "Saudi Arabia"
 msgstr "Arabie saoudite"
 
 #: shared/web/GroupsWeb.py:87
-#, fuzzy
 msgid "Intersection"
-msgstr "Instruction"
+msgstr "Intersection"
 
-#: shared/common/kinds.py:3680
+#: shared/common/kinds.py:3642
 msgid "Token"
 msgstr "Jeton"
 
@@ -664,17 +677,16 @@ msgstr "Type des membres"
 msgid "All Objects"
 msgstr "Tous les objets"
 
-#: shared/common/kinds.py:2346
+#: shared/common/kinds.py:2308
 #, fuzzy
 msgid "Enter Twice"
 msgstr "Liste à valeurs entières"
 
 #: templates/theridion/infos.xml.in.h:1
-#, fuzzy
 msgid "Theridion"
-msgstr "Version"
+msgstr "Théridion"
 
-#: shared/common/faults.py:475
+#: shared/common/faults.py:476
 #, fuzzy
 msgid "Winners group is not empty!"
 msgstr "Groupe des vainqueurs"
@@ -696,7 +708,7 @@ msgstr "Mai"
 msgid "Current Password"
 msgstr "Mot de passe actuel"
 
-#: shared/web/kinds.py:425
+#: shared/web/kinds.py:418
 msgid "Default Values"
 msgstr "Valeurs par défaut"
 
@@ -735,7 +747,7 @@ msgstr ""
 "document. Si vous ignorez quel format utiliser, contentez-vous de choisir "
 "SPIP et tapez ce document comme vous le faites d'habitude."
 
-#: shared/common/kinds.py:2580
+#: shared/common/kinds.py:2542
 #, fuzzy
 msgid "Minimum Number of Items"
 msgstr "Nombre de résultats"
@@ -744,8 +756,8 @@ msgstr "Nombre de r
 msgid "Saint Lucia"
 msgstr "Sainte-Lucie"
 
-#: shared/common/faults.py:264 shared/common/faults.py:272
-#: shared/common/faults.py:347
+#: shared/common/faults.py:265 shared/common/faults.py:273
+#: shared/common/faults.py:348
 msgid "Wrong value!"
 msgstr "Valeur erronée !"
 
@@ -777,7 +789,7 @@ msgstr "Empreinte GnuPG"
 msgid "Find"
 msgstr "Rechercher"
 
-#: shared/web/ObjectsWeb.py:364 shared/web/VotesWeb.py:755
+#: shared/web/ObjectsWeb.py:368 shared/web/VotesWeb.py:755
 #: shared/web/modes.py:257
 msgid "Editing %s - %s"
 msgstr "Édition de %s - %s"
@@ -787,7 +799,7 @@ msgstr "
 msgid "All Label"
 msgstr "Libellé"
 
-#: shared/web/tools.py:488
+#: shared/web/tools.py:431 shared/web/tools.py:481
 msgid "(missing item)"
 msgstr ""
 
@@ -807,11 +819,15 @@ msgstr ""
 msgid "Viet Nam"
 msgstr "Viêt Nam"
 
-#: shared/common/CommentsCommon.py:78
-msgid "Enter the title of your comment."
-msgstr "Entrez le titre de votre commentaire."
+#: shared/web/geography.py:194
+msgid "Romania"
+msgstr "Roumanie"
 
-#: shared/common/kinds.py:1557 shared/common/kinds.py:3809
+#: shared/web/ElectionsWeb.py:368
+msgid "blank vote"
+msgstr "vote blanc"
+
+#: shared/common/kinds.py:1519 shared/common/kinds.py:3771
 #: shared/web/BrevesWeb.py:71
 msgid "Links"
 msgstr "Liens"
@@ -830,7 +846,7 @@ msgstr "OK"
 msgid "DIV With Label"
 msgstr "Libellés"
 
-#: shared/common/kinds.py:3955
+#: shared/common/kinds.py:3917
 msgid "Value Holder"
 msgstr "Conteneur de la valeur"
 
@@ -838,7 +854,7 @@ msgstr "Conteneur de la valeur"
 msgid "Jamaica"
 msgstr "Jamaïque"
 
-#: shared/common/VirtualHostsCommon.py:98
+#: shared/common/VirtualHostsCommon.py:158
 msgid "Enter the host name."
 msgstr "Entrez le nom d'hôte."
 
@@ -850,13 +866,12 @@ msgstr "Supprimer"
 msgid "New Zealand"
 msgstr "Nouvelle-Zélande"
 
-#: shared/common/kinds.py:2484
+#: shared/common/kinds.py:2446
 msgid "Script"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:398
+#: shared/common/xhtmlgenerator.py:401
 #: shared/web/AuthenticationLoginPasswordWeb.py:384
-#: shared/web/AuthenticationLoginPasswordWeb.py:431
 msgid "Missing Object (%s)"
 msgstr "Objet manquant (%s)"
 
@@ -904,7 +919,7 @@ msgstr ""
 msgid "Congo, the Democratic Republic of the"
 msgstr "Rép. dém. du Congo (ex-Zaïre)"
 
-#: shared/web/CommentsWeb.py:105
+#: shared/web/CommentsWeb.py:106
 msgid "Anonymous"
 msgstr "Anonyme"
 
@@ -912,7 +927,7 @@ msgstr "Anonyme"
 msgid "New Election"
 msgstr "Nouvelle élection"
 
-#: shared/common/kinds.py:1678
+#: shared/common/kinds.py:1640
 #, fuzzy
 msgid "Minimum Value"
 msgstr "Valeur année minimale"
@@ -941,12 +956,16 @@ msgstr "Ajouter:"
 msgid "Tonga"
 msgstr "Tonga"
 
+#: profiles/comments.xml.in.h:1
+msgid "Comments Support"
+msgstr "Support pour les commentaires"
+
 #: shared/web/ArticlesWeb.py:283
 msgid "DocBook Source - %s"
 msgstr "DocBook Source - %s"
 
 #: shared/web/AuthenticationLoginPasswordWeb.py:359
-#: shared/web/AuthenticationLoginPasswordWeb.py:518
+#: shared/web/AuthenticationLoginPasswordWeb.py:515
 msgid "The password has been sent successfully."
 msgstr "Le mot de passe a été envoyé avec succès."
 
@@ -958,7 +977,7 @@ msgstr "Proposer 
 msgid "Analyze"
 msgstr "Analyse"
 
-#: shared/common/VirtualHostsCommon.py:56
+#: shared/common/VirtualHostsCommon.py:58
 msgid "Select the default virtual host to use on this server"
 msgstr "Sélectionnez l'hôte virtuel par défaut pour ce serveur"
 
@@ -980,11 +999,11 @@ msgstr "Artus (version actuelle)"
 msgid "New Implementation"
 msgstr "Nouvelle implémentation"
 
-#: shared/common/faults.py:248
+#: shared/common/faults.py:249
 msgid "Specified path is not a file!"
 msgstr "Le chemin d'accès spécifié n'aboutit pas à un fichier !"
 
-#: shared/common/kinds.py:2798
+#: shared/common/kinds.py:2760
 #, fuzzy
 msgid "Choose the user(s) of this object."
 msgstr "Sélectionnez le ou les auteurs de ce document."
@@ -1072,7 +1091,7 @@ msgstr ""
 msgid "ID"
 msgstr "Identifiant"
 
-#: shared/common/kinds.py:1687
+#: shared/common/kinds.py:1649
 msgid "Integer Number"
 msgstr "Nombre entier"
 
@@ -1099,9 +1118,8 @@ msgid "Myanmar"
 msgstr "Birmanie"
 
 #: shared/web/TranslationsWeb.py:487
-#, fuzzy
 msgid "Translation Status"
-msgstr "État de la traduction"
+msgstr "État des traductions"
 
 #: shared/web/PeopleWeb.py:283
 msgid ""
@@ -1119,7 +1137,7 @@ msgstr ""
 msgid "Member of groups"
 msgstr "Membre des groupes"
 
-#: shared/common/kinds.py:3119
+#: shared/common/kinds.py:3081
 msgid "Server Role"
 msgstr "Rôle de serveur"
 
@@ -1127,7 +1145,7 @@ msgstr "R
 msgid "The account and the user card have been removed successfully."
 msgstr "Le compte et la fiche utilisateur ont été supprimés avec succès."
 
-#: shared/common/VirtualHostsCommon.py:84
+#: shared/common/VirtualHostsCommon.py:144
 msgid ""
 "Enter the Glasnost dispatcher id for this virtual host (you may have to "
 "consult your administrator)."
@@ -1135,9 +1153,9 @@ msgstr ""
 "Entrez l'indentifiant Glasnost de cet hôte virtuel (il se peut que vous ayez "
 "besoin de consulter votre administrateur)."
 
-#: shared/web/ElectionsWeb.py:368
-msgid "blank vote"
-msgstr "vote blanc"
+#: templates/pel-infini/infos.xml.in.h:1
+msgid "infini (assoc brest)"
+msgstr ""
 
 #: shared/web/geography.py:166
 msgid "Mauritania"
@@ -1146,7 +1164,7 @@ msgstr "Mauritanie"
 #: shared/common/kinds.py:225 shared/common/kinds.py:248
 #: shared/common/kinds.py:270 shared/common/modes.py:97
 msgid "Read Only / Hidden If Empty"
-msgstr ""
+msgstr "Lecture seule / caché quand vide"
 
 #: shared/web/geography.py:181
 msgid "Nauru"
@@ -1205,10 +1223,6 @@ msgstr "Sierra Leone"
 msgid "Israel"
 msgstr "Israël"
 
-#: shared/web/geography.py:228
-msgid "Uganda"
-msgstr "Ouganda"
-
 #: shared/web/ElectionsWeb.py:350 shared/web/ElectionsWeb.py:366
 msgid "secret"
 msgstr "secret"
@@ -1345,7 +1359,7 @@ msgstr "Valeur par d
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: shared/web/UploadFilesWeb.py:352
+#: shared/web/UploadFilesWeb.py:355
 msgid "Your last files"
 msgstr "Vos derniers fichiers"
 
@@ -1361,7 +1375,7 @@ msgstr "Obligatoire"
 msgid "Public Ballot"
 msgstr "Bulletin public"
 
-#: shared/web/ObjectsWeb.py:652
+#: shared/web/ObjectsWeb.py:660
 msgid "Id for \"%s\""
 msgstr "Id pour \"%s\""
 
@@ -1369,7 +1383,7 @@ msgstr "Id pour \"%s\""
 msgid "Heading"
 msgstr "Rubrique"
 
-#: shared/common/kinds.py:3161
+#: shared/common/kinds.py:3123
 msgid "Slot Name"
 msgstr "Nom de l'emplacement"
 
@@ -1377,7 +1391,7 @@ msgstr "Nom de l'emplacement"
 msgid "New Alias"
 msgstr "Nouvel alias"
 
-#: shared/common/kinds.py:3793
+#: shared/common/kinds.py:3755
 #, fuzzy
 msgid "Action"
 msgstr "élection"
@@ -1398,7 +1412,7 @@ msgstr "Nouveau %s"
 msgid "Reverse Year Order?"
 msgstr "Années dans l'ordre inverse ?"
 
-#: shared/common/kinds.py:2741
+#: shared/common/kinds.py:2703
 msgid "Accepted Types"
 msgstr "Types acceptés"
 
@@ -1435,15 +1449,19 @@ msgstr "G
 msgid "Definition"
 msgstr "Définition"
 
+#: profiles/ldap.xml.in.h:1
+msgid "LDAP Support"
+msgstr "Support LDAP"
+
 #: shared/common/CardsCommon.py:607
 msgid "Card"
 msgstr "Fiche"
 
-#: shared/common/kinds.py:2852 shared/common/kinds.py:2858
+#: shared/common/kinds.py:2814 shared/common/kinds.py:2820
 msgid "Properties"
 msgstr "Propriétés"
 
-#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:365
+#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:368
 #: talTranslations.py:6
 msgid "Files"
 msgstr "Fichiers"
@@ -1494,9 +1512,9 @@ msgstr "Arm
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: shared/web/TranslationsWeb.py:125
-msgid "From "
-msgstr "De "
+#: shared/web/ElectionsWeb.py:70
+msgid "Kind of Ballots"
+msgstr "Type de bulletins"
 
 #: shared/web/TranslationsWeb.py:232
 msgid "Sources"
@@ -1534,10 +1552,6 @@ msgstr "Les derni
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: shared/web/geography.py:179
-msgid "Norway"
-msgstr "Norvège"
-
 #: shared/common/BrevesCommon.py:199
 msgid "New Short Article"
 msgstr "Nouvelle brève"
@@ -1563,7 +1577,7 @@ msgstr "Albanie"
 msgid "Exclusive Choice"
 msgstr "Au choix de l'utilisateur"
 
-#: shared/common/CommentsCommon.py:101 shared/web/ElectionsWeb.py:316
+#: shared/common/CommentsCommon.py:103 shared/web/ElectionsWeb.py:316
 msgid "comment"
 msgstr "commentaire"
 
@@ -1591,7 +1605,7 @@ msgstr "Titres"
 msgid "Malaysia"
 msgstr "Malaisie"
 
-#: shared/web/AppointmentsWeb.py:677 shared/web/widgets.py:612
+#: shared/web/AppointmentsWeb.py:680 shared/web/widgets.py:612
 msgid "Month"
 msgstr "Mois"
 
@@ -1607,7 +1621,7 @@ msgstr "
 msgid "The last system files to administer"
 msgstr "Les derniers fichiers systèmes à administrer"
 
-#: shared/common/faults.py:549
+#: shared/common/faults.py:550
 msgid "Value too big!"
 msgstr "Valeur trop grande !"
 
@@ -1621,6 +1635,10 @@ msgstr ""
 "candidats.</p><p>Le candidat \"<i>%(candidate)s</i>\" remporte "
 "l'élection.</p>"
 
+#: shared/common/CommentsCommon.py:75
+msgid "Editorial Comment ?"
+msgstr "Commentaire éditorial ?"
+
 #: shared/common/ArticlesCommon.py:145
 msgid "article"
 msgstr "article"
@@ -1635,14 +1653,13 @@ msgstr ""
 "Indiquez si vous souhaitez que Glasnost encrypte les emails qu'il vous "
 "envoie."
 
-#: shared/common/kinds.py:1839
+#: shared/common/kinds.py:1801
 msgid "Mapping"
 msgstr "Dictionnaire"
 
-#: templates/linuxdays/infos.xml.in.h:1
-#, fuzzy
-msgid "Luxembourg LinuxDays"
-msgstr "Luxembourg"
+#: shared/common/VirtualHostsCommon.py:174
+msgid "Usage Profiles"
+msgstr "Profils d'utilisation"
 
 #: shared/web/geography.py:165
 msgid "Mongolia"
@@ -1708,7 +1725,7 @@ msgstr "Membres"
 msgid "Version Number"
 msgstr "Numéro de version"
 
-#: shared/web/AppointmentsWeb.py:91
+#: shared/web/AppointmentsWeb.py:93
 msgid "Select the people and groups who are assigned to this appointment."
 msgstr ""
 "Sélectionnez les personnes et les groupes qui sont assignés à ce rendez-vous."
@@ -1740,6 +1757,14 @@ msgstr "Fidji"
 msgid "Table with One-on-One comparisons of the candidates"
 msgstr "Table de comparaison des candidats deux à deux"
 
+#: glasnost-web/siteMap.py:69
+msgid "Site Map"
+msgstr "Plan du site"
+
+#: shared/common/xhtmlgenerator.py:62
+msgid "Abstain"
+msgstr "S'abstenir"
+
 #: shared/web/TranslationsWeb.py:208
 msgid "Good"
 msgstr "Correcte"
@@ -1796,7 +1821,7 @@ msgstr "Mettre 
 msgid "Your elections being written"
 msgstr "Vos élections en cours de rédaction"
 
-#: shared/web/AppointmentsWeb.py:210
+#: shared/web/AppointmentsWeb.py:212
 msgid "Future events"
 msgstr "Événements futurs"
 
@@ -1886,7 +1911,7 @@ msgstr "Jour"
 msgid "Monaco"
 msgstr "Monaco"
 
-#: shared/common/kinds.py:3811
+#: shared/common/kinds.py:3773
 #, fuzzy
 msgid "Push Button"
 msgstr "Mutation"
@@ -1917,7 +1942,7 @@ msgstr "R
 msgid "Finnish"
 msgstr "Finnois"
 
-#: shared/common/kinds.py:2747
+#: shared/common/kinds.py:2709
 msgid "Accepted Roles"
 msgstr "Rôles acceptés"
 
@@ -1938,7 +1963,7 @@ msgstr "Dimanche"
 msgid "Argentina"
 msgstr "Argentine"
 
-#: shared/common/kinds.py:3781
+#: shared/common/kinds.py:3743
 msgid "Extended Choice"
 msgstr "Choix élargi"
 
@@ -1957,7 +1982,7 @@ msgstr ""
 msgid "Others"
 msgstr "Autres"
 
-#: shared/web/AppointmentsWeb.py:635
+#: shared/web/AppointmentsWeb.py:638
 msgid "Hour: %s - %s"
 msgstr "Heure: %s - %s"
 
@@ -1965,7 +1990,7 @@ msgstr "Heure: %s - %s"
 msgid "Cuba"
 msgstr "Cuba"
 
-#: shared/common/CommentsCommon.py:103
+#: shared/common/CommentsCommon.py:105
 msgid "comments"
 msgstr "commentaires"
 
@@ -1995,9 +2020,9 @@ msgstr "Jeton de vote"
 
 #: shared/common/AuthenticationLoginPasswordCommon.py:115
 msgid "Subject for the \"welcome\" email."
-msgstr ""
+msgstr "Sujet du courrier de bienvenue."
 
-#: shared/web/ObjectsWeb.py:775
+#: shared/web/ObjectsWeb.py:783
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
@@ -2021,7 +2046,7 @@ msgstr "Entrez le texte du document."
 msgid "Other Translations"
 msgstr "Autres traductions"
 
-#: shared/common/VirtualHostsCommon.py:124
+#: shared/common/VirtualHostsCommon.py:218
 msgid "Template"
 msgstr "Modèle"
 
@@ -2045,8 +2070,7 @@ msgstr "Largeur"
 msgid "Malta"
 msgstr "Malte"
 
-#: shared/common/CommentsCommon.py:104 shared/web/ObjectsWeb.py:1206
-#: shared/web/ObjectsWeb.py:1222
+#: shared/common/CommentsCommon.py:106 shared/web/CommentsWeb.py:163
 msgid "Comments"
 msgstr "Commentaires"
 
@@ -2054,7 +2078,7 @@ msgstr "Commentaires"
 msgid "Registered Voters:"
 msgstr "Électeurs inscrits :"
 
-#: shared/common/kinds.py:3578 shared/web/GroupsWeb.py:88
+#: shared/common/kinds.py:3540 shared/web/GroupsWeb.py:88
 msgid "Union"
 msgstr "Union"
 
@@ -2074,7 +2098,7 @@ msgstr "fichiers syst
 msgid "Select the author(s) of the document."
 msgstr "Sélectionnez le ou les auteurs de ce document."
 
-#: shared/common/kinds.py:2816
+#: shared/common/kinds.py:2778
 #, fuzzy
 msgid "People Set"
 msgstr "Personnes"
@@ -2118,7 +2142,7 @@ msgstr "Suisse"
 
 #: shared/web/things.py:190
 msgid "View the new version"
-msgstr ""
+msgstr "Voir la nouvelle version"
 
 #: shared/common/PeopleCommon.py:106
 msgid "Enter an eventual nickname here."
@@ -2132,13 +2156,17 @@ msgstr "Utilisateur:"
 msgid "Egypt"
 msgstr "Égypte"
 
+#: profiles/translations.xml.in.h:1
+msgid "Translations Support"
+msgstr "Support pour la traduction"
+
 #: shared/web/geography.py:121
 msgid "Honduras"
 msgstr "Honduras"
 
-#: shared/common/xhtmlgenerator.py:62
-msgid "Abstain"
-msgstr "S'abstenir"
+#: shared/web/AuthenticationLoginPasswordWeb.py:513
+msgid "An error occured while sending the password."
+msgstr "Une erreur s'est produite lors de l'envoi du mot de passe."
 
 #: shared/common/translation.py:66
 msgid "Portuguese"
@@ -2148,21 +2176,17 @@ msgstr "Portugais"
 msgid "The last system files"
 msgstr "Les derniers fichiers système"
 
-#: templates/pel-infini/infos.xml.in.h:1
-msgid "infini (assoc brest)"
-msgstr ""
-
 #: shared/web/PreferencesWeb.py:70
 msgid "Crypt Emails"
 msgstr "Encrypter les emails"
 
 #: shared/common/xhtmlgenerator.py:85
-#: shared/web/AuthenticationLoginPasswordWeb.py:496
+#: shared/web/AuthenticationLoginPasswordWeb.py:493
 #: shared/web/AuthenticationLdapWeb.py:124 talTranslations.py:14
 msgid "Login"
 msgstr "S'identifier"
 
-#: shared/common/faults.py:225
+#: shared/common/faults.py:226
 msgid "Invalid email address"
 msgstr "Adresse email invalide."
 
@@ -2170,10 +2194,9 @@ msgstr "Adresse email invalide."
 msgid "Guyana"
 msgstr "Guyana"
 
-#: shared/common/kinds.py:3909 shared/common/modes.py:188
-#, fuzzy
+#: shared/common/kinds.py:3871 shared/common/modes.py:188
 msgid "Mode"
-msgstr "Jeton d'utilisateur"
+msgstr "Mode"
 
 #: shared/common/widgets.py:327
 msgid "Custom Buttons Bar"
@@ -2201,7 +2224,7 @@ msgstr "objet"
 msgid "Button"
 msgstr "Mutation"
 
-#: shared/common/kinds.py:3826
+#: shared/common/kinds.py:3788
 msgid "Fault"
 msgstr "Erreur"
 
@@ -2243,7 +2266,7 @@ msgstr ""
 msgid "View Aspect"
 msgstr "Vues"
 
-#: shared/web/UploadFilesWeb.py:359
+#: shared/web/UploadFilesWeb.py:362
 msgid "The last files"
 msgstr "Les derniers fichiers"
 
@@ -2260,7 +2283,7 @@ msgstr ""
 msgid "Germany"
 msgstr "Allemagne"
 
-#: shared/common/VirtualHostsCommon.py:121
+#: shared/common/VirtualHostsCommon.py:215
 msgid "Select the template (skin) to use for this host."
 msgstr "Sélectionnez l'apparence à utiliser pour cet hôte."
 
@@ -2284,7 +2307,7 @@ msgstr "R
 msgid "April"
 msgstr "Avril"
 
-#: shared/common/kinds.py:2812 shared/common/kinds.py:2818
+#: shared/common/kinds.py:2774 shared/common/kinds.py:2780
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -2321,7 +2344,7 @@ msgstr ""
 msgid "headings"
 msgstr "Rubriques"
 
-#: shared/common/kinds.py:3771 shared/common/kinds.py:3773
+#: shared/common/kinds.py:3733 shared/common/kinds.py:3735
 msgid "Writers"
 msgstr "Éditeurs"
 
@@ -2345,7 +2368,7 @@ msgstr "Barre de boutons d'action"
 msgid "Winners Grading"
 msgstr "Classement des vainqueurs"
 
-#: shared/common/kinds.py:3314
+#: shared/common/kinds.py:3276
 #, fuzzy
 msgid "Access in View Mode"
 msgstr "État dans le mode \"Utilisation\""
@@ -2366,7 +2389,7 @@ msgstr "Cha
 
 #: shared/common/AuthenticationLoginPasswordCommon.py:105
 msgid "Text sent to welcome people."
-msgstr ""
+msgstr "Texte envoyé aux nouveaux inscrits."
 
 #: shared/web/TranslationsWeb.py:224
 msgid "Similar String"
@@ -2416,7 +2439,7 @@ msgstr "Lecteurs"
 msgid "Header 6"
 msgstr "Lecteurs"
 
-#: shared/common/faults.py:362
+#: shared/common/faults.py:363
 msgid "Missing value!"
 msgstr "Valeur manquante !"
 
@@ -2441,6 +2464,11 @@ msgstr "Br
 msgid "Enter the text of your comment."
 msgstr "Entrez le texte de votre commentaire."
 
+#: templates/linuxdays/infos.xml.in.h:1
+#, fuzzy
+msgid "Luxembourg LinuxDays"
+msgstr "Luxembourg"
+
 #: shared/web/geography.py:226
 msgid "Tanzania, United Republic of"
 msgstr "Tanzanie"
@@ -2454,13 +2482,12 @@ msgid "Cote D'ivoire"
 msgstr "Côte d'Ivoire"
 
 #: shared/web/AuthenticationLoginPasswordWeb.py:353
-#, fuzzy
 msgid ""
 "A SMTP error occured when trying to send the password.\n"
 "Maybe the Mail Transport Agent on the Glasnost server is not\n"
 "correctly configured."
 msgstr ""
-"Le compte a été créé avec succès, mais une erreur SMTP est survenue.\n"
+"Une erreur SMTP est survenue en essayant d'envoyer le mot de passe.\n"
 "Il se peut que l'Agent de Transport des Mails (MTA) installé sur le serveur "
 "Glasnost soit mal configuré."
 
@@ -2477,7 +2504,7 @@ msgstr "Identique au mode d'
 msgid "Are you sure you want to delete the %s \"%s\" ?"
 msgstr "Êtes-vous sûr de vouloir supprimer la fiche %s \"%s\" ?"
 
-#: shared/common/kinds.py:3764
+#: shared/common/kinds.py:3726
 msgid "Select the people and groups who are allowed to modify the item."
 msgstr ""
 "Sélectionnez les personnes et groupes qui seront autorisés à modifier cet "
@@ -2505,7 +2532,7 @@ msgstr ""
 msgid "Gambia"
 msgstr "Gambie"
 
-#: shared/common/kinds.py:1755 shared/common/kinds.py:1763
+#: shared/common/kinds.py:1717 shared/common/kinds.py:1725
 msgid "Language"
 msgstr "Langue"
 
@@ -2526,9 +2553,9 @@ msgstr "Cambodge"
 msgid "Blank Ballots:"
 msgstr "Bulletins blancs :"
 
-#: shared/common/kinds.py:1103 shared/common/kinds.py:1761
-#: shared/common/kinds.py:2482 shared/common/kinds.py:2583
-#: shared/common/kinds.py:3945
+#: shared/common/kinds.py:1103 shared/common/kinds.py:1723
+#: shared/common/kinds.py:2444 shared/common/kinds.py:2545
+#: shared/common/kinds.py:3907
 msgid "Data"
 msgstr "Données"
 
@@ -2546,7 +2573,7 @@ msgid "Ties"
 msgstr "Égalités"
 
 #: shared/common/kinds.py:1315 shared/common/widgets.py:207
-#: shared/web/AppointmentsWeb.py:204 shared/web/AppointmentsWeb.py:216
+#: shared/web/AppointmentsWeb.py:206 shared/web/AppointmentsWeb.py:218
 #: shared/web/ArticlesWeb.py:323
 msgid "Date"
 msgstr "Date"
@@ -2578,7 +2605,7 @@ msgstr "Libell
 msgid "Editing Translation"
 msgstr "Édition de la traduction"
 
-#: shared/common/kinds.py:3800
+#: shared/common/kinds.py:3762
 #, fuzzy
 msgid "Next Mode"
 msgstr "Jeton d'utilisateur"
@@ -2611,11 +2638,11 @@ msgstr ""
 "Les informations ont changé pendant que vous étiez en train de les éditer.\n"
 "Sauvegardez vos modifications, puis recommencez votre édition."
 
-#: shared/common/CommentsCommon.py:99
+#: shared/common/CommentsCommon.py:101
 msgid "New Comment"
 msgstr "Nouveau commentaire"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:469
+#: shared/web/AuthenticationLoginPasswordWeb.py:466
 #: shared/web/AuthenticationLdapWeb.py:99
 msgid "To access this part of the site, you need to sign in."
 msgstr "Pour accéder à cette partie du site, vous devez vous identifier."
@@ -2628,11 +2655,11 @@ msgstr "Utiliser les r
 msgid "xOctober"
 msgstr "xoctobre"
 
-#: shared/web/AppointmentsWeb.py:93
+#: shared/web/AppointmentsWeb.py:95
 msgid "Participants"
 msgstr "Participants"
 
-#: shared/web/AppointmentsWeb.py:95
+#: shared/web/AppointmentsWeb.py:97
 msgid "Start"
 msgstr "Début"
 
@@ -2649,9 +2676,9 @@ msgstr "Date d'
 msgid "Dominica"
 msgstr "Dominique"
 
-#: shared/web/VotesWeb.py:373
-msgid "Voter"
-msgstr "Électeur"
+#: shared/web/TranslationsWeb.py:125
+msgid "From "
+msgstr "De "
 
 #: shared/common/VotesCommon.py:372 shared/web/ElectionsWeb.py:284
 #: shared/web/VotesWeb.py:914
@@ -2666,7 +2693,7 @@ msgstr "Br
 msgid "(%d words)"
 msgstr "(%d mots)"
 
-#: shared/web/AppointmentsWeb.py:238
+#: shared/web/AppointmentsWeb.py:240
 msgid "Day long appointments"
 msgstr "Rendez-vous pour toute la journée"
 
@@ -2686,10 +2713,9 @@ msgstr "Hongrie"
 msgid "Minimum Year Value Difference to Now"
 msgstr "Année minimum en différence par rapport à maintenant."
 
-#: shared/common/kinds.py:3805
-#, fuzzy
-msgid "Next Object"
-msgstr "Nouvel objet"
+#: shared/web/geography.py:228
+msgid "Uganda"
+msgstr "Ouganda"
 
 #: shared/common/RubricsCommon.py:114
 msgid "Headings"
@@ -2703,7 +2729,7 @@ msgstr "S
 msgid "Currency"
 msgstr "Devise"
 
-#: shared/common/kinds.py:2573
+#: shared/common/kinds.py:2535
 #, fuzzy
 msgid "Item Type"
 msgstr "Type Mime"
@@ -2732,7 +2758,7 @@ msgstr "Personnes"
 msgid "Chad"
 msgstr "Tchad"
 
-#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:90
+#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:150
 msgid "Glasnost Dispatcher ID"
 msgstr "Identifiant de contrôleur Glasnost"
 
@@ -2805,12 +2831,12 @@ msgstr "Envoyer par email"
 msgid "Bolivia"
 msgstr "Bolivie"
 
-#: shared/common/xhtmlgenerator.py:248 shared/common/widgets.py:154
+#: shared/common/xhtmlgenerator.py:251 shared/common/widgets.py:154
 #: shared/common/widgets.py:358 shared/web/widgets.py:506
 msgid "None"
 msgstr "Aucun"
 
-#: shared/common/kinds.py:2472
+#: shared/common/kinds.py:2434
 msgid "Source Code"
 msgstr "Code source"
 
@@ -2855,7 +2881,7 @@ msgstr ""
 "les autres, l'élection doit être \"clôturée\" pour que les résultats soient "
 "affichés."
 
-#: shared/common/faults.py:541
+#: shared/common/faults.py:542
 msgid "Value too small!"
 msgstr "Valeur trop petite !"
 
@@ -2863,6 +2889,10 @@ msgstr "Valeur trop petite !"
 msgid "Link Entry Field"
 msgstr ""
 
+#: profiles/cms.xml.in.h:1
+msgid "Content Management System"
+msgstr "Système de gestion de contenu"
+
 #: shared/web/geography.py:178
 msgid "Netherlands"
 msgstr "Pays-Bas"
@@ -2880,13 +2910,9 @@ msgstr ""
 msgid "Evaluate"
 msgstr "Évaluer"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:516
-msgid "An error occured while sending the password."
-msgstr "Une erreur s'est produite lors de l'envoi du mot de passe."
-
-#: shared/web/geography.py:194
-msgid "Romania"
-msgstr "Roumanie"
+#: shared/web/geography.py:77
+msgid "Belarus"
+msgstr "Biélorussie"
 
 #: shared/web/geography.py:176
 msgid "Nigeria"
@@ -2906,7 +2932,7 @@ msgstr "Identifiant de connexion"
 msgid "Benin"
 msgstr "Bénin"
 
-#: shared/common/kinds.py:2373
+#: shared/common/kinds.py:2335
 msgid "Python Identifier"
 msgstr "Identicateur Python"
 
@@ -2974,11 +3000,11 @@ msgstr "Salomon"
 msgid "Multi-Line Field"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:247
+#: shared/common/VirtualHostsCommon.py:341
 msgid "Virtual Host"
 msgstr "Hôte virtuel"
 
-#: shared/web/AppointmentsWeb.py:88
+#: shared/web/AppointmentsWeb.py:90
 msgid "End"
 msgstr "Fin"
 
@@ -3007,10 +3033,6 @@ msgstr "Kiribati"
 msgid "Kenya"
 msgstr "Kenya"
 
-#: shared/common/kinds.py:1517
-msgid "Function Name"
-msgstr "Nom de fonction"
-
 #: shared/web/geography.py:152
 msgid "Lesotho"
 msgstr "Lesotho"
@@ -3023,7 +3045,7 @@ msgstr ""
 msgid "Best Average"
 msgstr "Meilleure moyenne"
 
-#: shared/common/kinds.py:3865
+#: shared/common/kinds.py:3827
 msgid "Kind Name"
 msgstr "Nom du type"
 
@@ -3047,7 +3069,7 @@ msgstr ""
 "Sélectionnez les personnes et groupes qui sont autorisés à administrer ce "
 "type d'éléments."
 
-#: shared/common/BrevesCommon.py:204 shared/web/tools.py:627
+#: shared/common/BrevesCommon.py:204 shared/web/tools.py:616
 #: shared/web/BrevesWeb.py:168 talTranslations.py:17
 msgid "Short News"
 msgstr "Brèves"
@@ -3077,7 +3099,7 @@ msgstr "S
 msgid "The election \"%s\""
 msgstr "L'élection \"%s\""
 
-#: shared/web/AppointmentsWeb.py:225 shared/web/AppointmentsWeb.py:683
+#: shared/web/AppointmentsWeb.py:227 shared/web/AppointmentsWeb.py:686
 msgid "Agenda"
 msgstr "Agenda"
 
@@ -3190,7 +3212,7 @@ msgstr ""
 msgid "Authentication (LDAP)"
 msgstr "Authentification (LDAP)"
 
-#: shared/common/VirtualHostsCommon.py:248
+#: shared/common/VirtualHostsCommon.py:342
 msgid "virtual hosts"
 msgstr "hôtes virtuels"
 
@@ -3198,7 +3220,7 @@ msgstr "h
 msgid "group"
 msgstr "groupe"
 
-#: shared/common/kinds.py:436 shared/common/kinds.py:3966
+#: shared/common/kinds.py:436 shared/common/kinds.py:3928
 #: shared/common/xhtmlgenerator.py:114 shared/common/modes.py:141
 #: shared/common/widgets.py:80 shared/common/widgets.py:84
 msgid "Widget"
@@ -3212,7 +3234,7 @@ msgstr "Rang"
 msgid "New Forum"
 msgstr "Nouveau forum"
 
-#: shared/web/AppointmentsWeb.py:57
+#: shared/web/AppointmentsWeb.py:59
 msgid "Categories Group"
 msgstr "Groupe des catégories"
 
@@ -3271,7 +3293,7 @@ msgstr ""
 msgid "Author"
 msgstr "Auteur"
 
-#: shared/common/VirtualHostsCommon.py:246
+#: shared/common/VirtualHostsCommon.py:340
 msgid "virtual host"
 msgstr "hôte virtuel"
 
@@ -3283,7 +3305,7 @@ msgstr "Entrez votre mot de passe actuel."
 msgid "Sao Tome and Principe"
 msgstr "Sao Tomé-et-Principe"
 
-#: shared/common/kinds.py:2826
+#: shared/common/kinds.py:2788
 msgid "Choose the author(s) for this object."
 msgstr "Sélectionnez le ou les auteurs de ce document."
 
@@ -3295,12 +3317,16 @@ msgstr "Appliquer"
 msgid "Public Ballots"
 msgstr "Bulletins publics"
 
-#: shared/common/kinds.py:3946 shared/common/UploadFilesCommon.py:135
+#: shared/common/kinds.py:3908 shared/common/UploadFilesCommon.py:135
 #: shared/common/uploads.py:74 shared/web/UploadFilesWeb.py:77
 #: shared/web/uploads.py:67
 msgid "File"
 msgstr "Fichier"
 
+#: shared/common/kinds.py:3812 shared/common/values.py:53
+msgid "Kind"
+msgstr "Sorte"
+
 #: shared/common/kinds.py:1267 shared/common/kinds.py:1269
 msgid "Date & Time"
 msgstr "Date & heure"
@@ -3313,7 +3339,7 @@ msgstr "Termin
 msgid "Enter the name of this heading."
 msgstr "Entrez le nom de cette rubrique."
 
-#: shared/web/AppointmentsWeb.py:678 shared/web/widgets.py:598
+#: shared/web/AppointmentsWeb.py:681 shared/web/widgets.py:598
 msgid "Year"
 msgstr "Année"
 
@@ -3323,7 +3349,7 @@ msgstr "R
 
 #: shared/common/xhtmlgenerator.py:90
 #: shared/web/AuthenticationLoginPasswordWeb.py:371
-#: shared/web/AuthenticationLoginPasswordWeb.py:576
+#: shared/web/AuthenticationLoginPasswordWeb.py:573
 msgid "New Account"
 msgstr "Nouveau compte"
 
@@ -3376,7 +3402,7 @@ msgstr "Japon"
 msgid "Alias"
 msgstr "Alias"
 
-#: shared/common/kinds.py:3276
+#: shared/common/kinds.py:3238
 #, fuzzy
 msgid "Access in Creation Mode"
 msgstr "Date de création"
@@ -3402,7 +3428,7 @@ msgstr "Maldives"
 msgid "Eritrea"
 msgstr "Érythrée"
 
-#: shared/common/kinds.py:2462
+#: shared/common/kinds.py:2424
 msgid "Execute On Display"
 msgstr ""
 
@@ -3464,7 +3490,7 @@ msgstr "Liechtenstein"
 msgid "Format"
 msgstr "Format"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:611
+#: shared/web/AuthenticationLoginPasswordWeb.py:608
 msgid ""
 "The account has successfully been created, but a SMTP error has occurred.\n"
 "Maybe the Mail Transport Agent on the Glasnost server is badly configured."
@@ -3493,7 +3519,7 @@ msgstr "Nouvelle personne"
 msgid "Suriname"
 msgstr "Suriname"
 
-#: shared/common/VirtualHostsCommon.py:58
+#: shared/common/VirtualHostsCommon.py:60
 msgid "Default Virtual Host"
 msgstr "Hôte virtuel par défaut"
 
@@ -3509,7 +3535,7 @@ msgstr "Type de bulletin"
 msgid "State"
 msgstr "État"
 
-#: shared/common/kinds.py:2727
+#: shared/common/kinds.py:2689
 #, fuzzy
 msgid "Select accepted types of items."
 msgstr "Choisissez le mode de scrutin."
@@ -3522,7 +3548,7 @@ msgstr "N
 msgid "Administrators"
 msgstr "Administrateurs"
 
-#: shared/common/faults.py:240
+#: shared/common/faults.py:241
 msgid "Specified file path does not exist!"
 msgstr "Le chemin d'accès au fichier spécifié n'existe pas !"
 
@@ -3567,7 +3593,7 @@ msgstr ""
 "%s\n"
 
 #: shared/common/kinds.py:980 shared/common/kinds.py:1487
-#: shared/common/kinds.py:1685
+#: shared/common/kinds.py:1647
 msgid "Numbers"
 msgstr "Nombres"
 
@@ -3602,8 +3628,8 @@ msgstr "Liban"
 
 #: shared/common/ArticlesCommon.py:64 shared/common/kinds.py:378
 #: shared/common/kinds.py:1372 shared/common/kinds.py:1454
-#: shared/common/kinds.py:2353 shared/common/kinds.py:3206
-#: shared/common/kinds.py:3208 shared/web/AppointmentsWeb.py:64
+#: shared/common/kinds.py:2315 shared/common/kinds.py:3168
+#: shared/common/kinds.py:3170 shared/web/AppointmentsWeb.py:66
 #: shared/web/BrevesWeb.py:63 shared/web/CommentsWeb.py:62
 #: shared/web/ArticlesWeb.py:78
 msgid "Text"
@@ -3617,7 +3643,7 @@ msgstr "Allemand"
 msgid "hour"
 msgstr "heure"
 
-#: shared/common/faults.py:133
+#: shared/common/faults.py:134
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -3638,7 +3664,7 @@ msgstr "Mars"
 msgid "Text Format"
 msgstr "Format"
 
-#: shared/common/kinds.py:1674
+#: shared/common/kinds.py:1636
 #, fuzzy
 msgid "Maximum Value"
 msgstr "Valeur année maximale"
@@ -3700,8 +3726,8 @@ msgstr "Philippines"
 msgid "Denmark"
 msgstr "Danemark"
 
-#: shared/common/kinds.py:3279 shared/common/kinds.py:3298
-#: shared/common/kinds.py:3316
+#: shared/common/kinds.py:3241 shared/common/kinds.py:3260
+#: shared/common/kinds.py:3278
 #, fuzzy
 msgid "Embedded"
 msgstr "Terminée"
@@ -3736,7 +3762,7 @@ msgstr "SPIP"
 msgid "\"%s\" ImplementationsreadLanguages"
 msgstr ""
 
-#: shared/common/kinds.py:2923
+#: shared/common/kinds.py:2885
 msgid "Select the people and groups who are allowed to read the item."
 msgstr ""
 "Sélectionnez les personnes et les groupes qui seront autorisés à lire cet "
@@ -3776,10 +3802,14 @@ msgstr "Diff
 msgid "short article"
 msgstr "brève"
 
-#: shared/common/kinds.py:2563
+#: shared/common/kinds.py:2525
 msgid "Minimum Number of Items to Edit"
 msgstr ""
 
+#: profiles/vote.xml.in.h:1
+msgid "Electronic Voting"
+msgstr "Vote électronique"
+
 #: shared/common/kinds.py:1488
 msgid "Float Number"
 msgstr "Nombre flottant"
@@ -3829,8 +3859,8 @@ msgstr "Sortir"
 msgid "Re-enter your new password."
 msgstr "Réentrez votre nouveau mot de passe."
 
-#: shared/common/kinds.py:1783 shared/common/kinds.py:3280
-#: shared/common/kinds.py:3299 shared/common/kinds.py:3317
+#: shared/common/kinds.py:1745 shared/common/kinds.py:3242
+#: shared/common/kinds.py:3261 shared/common/kinds.py:3279
 msgid "Link"
 msgstr "Lien"
 
@@ -3854,7 +3884,7 @@ msgstr "Kowe
 msgid "CRANS"
 msgstr ""
 
-#: shared/common/kinds.py:2930 shared/common/kinds.py:2932
+#: shared/common/kinds.py:2892 shared/common/kinds.py:2894
 msgid "Readers"
 msgstr "Lecteurs"
 
@@ -3902,7 +3932,7 @@ msgstr "Retour"
 msgid "Enter your email address."
 msgstr "Entrez votre adresse de courriel."
 
-#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1310
+#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1309
 msgid " (at <%s>)"
 msgstr " ( chez <%s>)"
 
@@ -3930,7 +3960,7 @@ msgstr ", the open company"
 msgid "Change Password"
 msgstr "Changer de mot de passe"
 
-#: shared/common/faults.py:256
+#: shared/common/faults.py:257
 msgid "Access to file is denied!"
 msgstr "Accès au fichier interdit !"
 
@@ -3938,7 +3968,7 @@ msgstr "Acc
 msgid "Singapore"
 msgstr "Singapour"
 
-#: shared/common/VirtualHostsCommon.py:101
+#: shared/common/VirtualHostsCommon.py:161
 msgid "Web Host Name"
 msgstr "Nom d'hôte du site web"
 
@@ -3982,7 +4012,7 @@ msgstr ""
 "<p>Les candidats <i>%(candidates)s</i> obtiennent les meilleures "
 "moyennes.</p><p>Les candidats %(candidates)s remportent l'élection.</p>"
 
-#: shared/common/kinds.py:3573 shared/web/GroupsWeb.py:114
+#: shared/common/kinds.py:3535 shared/web/GroupsWeb.py:114
 msgid "Items"
 msgstr "Éléments"
 
@@ -4002,7 +4032,7 @@ msgstr ""
 "<p>Le candidat \"<i>%(candidate)s</i>\" obtient la meilleure "
 "moyenne.</p><p>Le candidat \"<i>%(candidate)s</i>\" remporte l'élection.</p>"
 
-#: shared/web/AppointmentsWeb.py:75
+#: shared/web/AppointmentsWeb.py:77
 msgid "Categories"
 msgstr "Catégories"
 
@@ -4011,7 +4041,7 @@ msgid "True"
 msgstr "Vrai"
 
 #: shared/common/TranslationsCommon.py:138 shared/web/TranslationsWeb.py:174
-#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:900
+#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:908
 msgid "Translation"
 msgstr "Traduction"
 
@@ -4019,16 +4049,16 @@ msgstr "Traduction"
 msgid "Entrouvert.com"
 msgstr ""
 
-#: shared/common/kinds.py:3090
+#: shared/common/kinds.py:3052
 #, fuzzy
 msgid "Glasnost Server ID"
 msgstr "Identifiant de contrôleur Glasnost"
 
-#: shared/common/kinds.py:3664 shared/common/kinds.py:3668
+#: shared/common/kinds.py:3626 shared/common/kinds.py:3630
 msgid "Modification Time"
 msgstr "Date de modification"
 
-#: shared/web/AppointmentsWeb.py:222
+#: shared/web/AppointmentsWeb.py:224
 msgid "Past events"
 msgstr "Événements passés"
 
@@ -4036,7 +4066,7 @@ msgstr "
 msgid "HTML"
 msgstr "HTML"
 
-#: shared/common/kinds.py:3296
+#: shared/common/kinds.py:3258
 #, fuzzy
 msgid "Access in Edition Mode"
 msgstr "Identique au mode d'édition"
@@ -4066,7 +4096,11 @@ msgstr "Empreinte OpenPGP"
 msgid "preferences"
 msgstr "préférences"
 
-#: shared/web/widgets.py:1871
+#: shared/common/xhtmlgenerator.py:92
+msgid "Pester Absentionnists"
+msgstr "Relancer les abstentionnistes"
+
+#: shared/web/widgets.py:1890
 msgid "other:"
 msgstr "autre :"
 
@@ -4074,15 +4108,15 @@ msgstr "autre :"
 msgid "vote"
 msgstr "vote"
 
-#: shared/web/ElectionsWeb.py:70
-msgid "Kind of Ballots"
-msgstr "Type de bulletins"
+#: shared/web/geography.py:179
+msgid "Norway"
+msgstr "Norvège"
 
 #: shared/web/TranslationsWeb.py:252
 msgid "Translators"
 msgstr "Traducteurs"
 
-#: shared/web/widgets.py:1739
+#: shared/web/widgets.py:1755
 msgid "download"
 msgstr "télécharger"
 
@@ -4102,8 +4136,8 @@ msgstr "seconde"
 msgid "Single-Line Text Entry Field"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:205 shared/web/AppointmentsWeb.py:217
-#: shared/web/widgets.py:1872
+#: shared/web/AppointmentsWeb.py:207 shared/web/AppointmentsWeb.py:219
+#: shared/web/widgets.py:1891
 msgid "Label"
 msgstr "Libellé"
 
@@ -4149,10 +4183,10 @@ msgstr "Choisissez le mode de scrutin."
 msgid "Select the front article of this heading."
 msgstr "Sélectionnez l'article introductif à cette rubrique."
 
-#: shared/web/ObjectsWeb.py:1194
+#: shared/common/kinds.py:3767
 #, fuzzy
-msgid "No comment."
-msgstr "commentaire"
+msgid "Next Object"
+msgstr "Nouvel objet"
 
 #: shared/common/modes.py:219
 #, fuzzy
@@ -4176,7 +4210,7 @@ msgstr ""
 msgid "Edition Aspect"
 msgstr "Date d'édition"
 
-#: shared/common/kinds.py:2366
+#: shared/common/kinds.py:2328
 msgid "Invalid values"
 msgstr ""
 
@@ -4184,7 +4218,7 @@ msgstr ""
 msgid "minute"
 msgstr "minute"
 
-#: shared/web/AppointmentsWeb.py:675
+#: shared/web/AppointmentsWeb.py:678
 msgid "Week"
 msgstr "Semaine"
 
@@ -4246,7 +4280,7 @@ msgstr "Nouveau rendez-vous"
 msgid "Choose the candidates for this election."
 msgstr "Sélectionnez les candidats de l'élection."
 
-#: shared/web/AppointmentsWeb.py:673 shared/web/widgets.py:628
+#: shared/web/AppointmentsWeb.py:676 shared/web/widgets.py:628
 msgid "Day"
 msgstr "Jour"
 
@@ -4276,7 +4310,7 @@ msgstr "Calendrier"
 msgid "Creation Aspect"
 msgstr "Date de création"
 
-#: shared/common/kinds.py:1559 shared/common/ObjectsCommon.py:215
+#: shared/common/kinds.py:1521 shared/common/ObjectsCommon.py:215
 msgid "Object"
 msgstr "Objet"
 
@@ -4350,9 +4384,10 @@ msgstr "Mac
 msgid "Election in progress"
 msgstr "Élection en cours"
 
-#: shared/common/kinds.py:3850 shared/common/values.py:53
-msgid "Kind"
-msgstr "Sorte"
+#: shared/web/CommentsWeb.py:156
+#, fuzzy
+msgid "Editorial Comments"
+msgstr "Poster un commentaire"
 
 #: shared/common/widgets.py:274
 #, fuzzy
@@ -4371,19 +4406,19 @@ msgstr "Kazakhstan"
 msgid "Somalia"
 msgstr "Somalie"
 
-#: shared/web/tools.py:633
+#: shared/web/tools.py:622
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: shared/common/VirtualHostsCommon.py:149 shared/web/AppointmentsWeb.py:97
+#: shared/common/VirtualHostsCommon.py:243 shared/web/AppointmentsWeb.py:99
 #: shared/web/ElectionsWeb.py:128 shared/web/BrevesWeb.py:73
-#: shared/web/CommentsWeb.py:69 shared/web/ForumsWeb.py:71
-#: shared/web/UploadFilesWeb.py:107 shared/web/widgets.py:932
-#: shared/web/ArticlesWeb.py:87 shared/web/SystemFilesWeb.py:82
+#: shared/web/ForumsWeb.py:71 shared/web/UploadFilesWeb.py:107
+#: shared/web/widgets.py:932 shared/web/ArticlesWeb.py:87
+#: shared/web/SystemFilesWeb.py:82
 msgid "Title"
 msgstr "Titre"
 
-#: shared/common/kinds.py:2838 shared/common/kinds.py:2840
+#: shared/common/kinds.py:2800 shared/common/kinds.py:2802
 msgid "Authors"
 msgstr "Auteurs"
 
@@ -4404,6 +4439,12 @@ msgstr ""
 msgid "Canada"
 msgstr "Canada"
 
+#~ msgid "Enter the title of your comment."
+#~ msgstr "Entrez le titre de votre commentaire."
+
+#~ msgid "Function Name"
+#~ msgstr "Nom de fonction"
+
 #~ msgid "Added to slot"
 #~ msgstr "Ajouté au slot"
 
diff --git a/po/glasnost-web/messages.pot b/po/glasnost-web/messages.pot
index c50ddfad..d26fdd85 100644
--- a/po/glasnost-web/messages.pot
+++ b/po/glasnost-web/messages.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Thu Nov  6 13:19:42 2003\n"
+"POT-Creation-Date: Tue Nov 18 16:12:53 2003\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"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "in3activa"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:249
+#: shared/common/VirtualHostsCommon.py:343
 msgid "Virtual Hosts"
 msgstr ""
 
-#: shared/common/kinds.py:1742
+#: shared/common/kinds.py:1704
 msgid "Integer Choice"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 msgid "New Translation"
 msgstr ""
 
-#: shared/common/kinds.py:2585
+#: shared/common/kinds.py:2547
 msgid "Sequence"
 msgstr ""
 
@@ -79,8 +79,8 @@ msgstr ""
 msgid "Secret Ballot"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:249
-msgid "Changing User Password"
+#: shared/common/CommentsCommon.py:86
+msgid "some comment"
 msgstr ""
 
 #: shared/common/ElectionsCommon.py:144
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Cyprus"
 msgstr ""
 
-#: shared/common/kinds.py:222 shared/common/kinds.py:3278
+#: shared/common/kinds.py:222 shared/common/kinds.py:3240
 msgid "Same As Edition Mode"
 msgstr ""
 
@@ -103,11 +103,11 @@ msgstr ""
 msgid "Check Box"
 msgstr ""
 
-#: shared/common/kinds.py:2467
+#: shared/common/kinds.py:2429
 msgid "Execute On Submit"
 msgstr ""
 
-#: shared/common/kinds.py:3703
+#: shared/common/kinds.py:3665
 msgid "User Token"
 msgstr ""
 
@@ -128,6 +128,10 @@ msgstr ""
 msgid "New Heading"
 msgstr ""
 
+#: shared/web/AuthenticationLoginPasswordWeb.py:249
+msgid "Changing User Password"
+msgstr ""
+
 #: shared/web/calendaring.py:60
 msgid "February"
 msgstr ""
@@ -136,7 +140,7 @@ msgstr ""
 msgid "Liberia"
 msgstr ""
 
-#: shared/common/kinds.py:3253
+#: shared/common/kinds.py:3215
 msgid "Structure"
 msgstr ""
 
@@ -145,7 +149,7 @@ msgid "Saint Kitts and Nevis"
 msgstr ""
 
 #: shared/common/AuthenticationLoginPasswordCommon.py:64
-#: shared/common/kinds.py:2355 shared/common/AuthenticationLdapCommon.py:63
+#: shared/common/kinds.py:2317 shared/common/AuthenticationLdapCommon.py:63
 #: shared/web/AuthenticationLoginPasswordWeb.py:69
 #: shared/web/AuthenticationLoginPasswordWeb.py:146
 msgid "Password"
@@ -191,12 +195,12 @@ msgstr ""
 msgid "Counting of the Votes"
 msgstr ""
 
-#: shared/common/kinds.py:2536
+#: shared/common/kinds.py:2498
 msgid "Script Source Code"
 msgstr ""
 
-#: shared/web/geography.py:65
-msgid "Burkina Faso"
+#: shared/web/VotesWeb.py:373
+msgid "Voter"
 msgstr ""
 
 #: shared/common/kinds.py:97
@@ -259,11 +263,11 @@ msgstr ""
 msgid "Add %s To Rubric"
 msgstr ""
 
-#: shared/web/GlasnostTALInterpreter.py:64
+#: shared/web/GlasnostTALInterpreter.py:67
 msgid "Error in generated HTML"
 msgstr ""
 
-#: shared/common/kinds.py:1749
+#: shared/common/kinds.py:1711
 msgid "Select the language used to fill in this card."
 msgstr ""
 
@@ -345,10 +349,14 @@ msgstr ""
 msgid "files"
 msgstr ""
 
-#: shared/common/kinds.py:3980
+#: shared/common/kinds.py:3942
 msgid "Widget Name"
 msgstr ""
 
+#: shared/web/CommentsWeb.py:168
+msgid "Add Comment"
+msgstr ""
+
 #: shared/web/TranslationsWeb.py:165 shared/web/TranslationsWeb.py:612
 #: shared/web/GradesWeb.py:85 shared/web/widgets.py:152
 #: shared/web/widgets.py:932 shared/web/widgets.py:938
@@ -377,14 +385,18 @@ msgstr ""
 msgid "Vote Blank"
 msgstr ""
 
+#: profiles/basic.xml.in.h:1
+msgid "Basic Functionalities"
+msgstr ""
+
 #: shared/web/AuthenticationLoginPasswordWeb.py:302
 msgid "Delete Account"
 msgstr ""
 
-#: shared/common/faults.py:324 shared/common/faults.py:486
-#: shared/common/faults.py:494 shared/common/faults.py:502
-#: shared/common/faults.py:510 shared/common/faults.py:518
-#: shared/common/faults.py:526
+#: shared/common/faults.py:325 shared/common/faults.py:487
+#: shared/common/faults.py:495 shared/common/faults.py:503
+#: shared/common/faults.py:511 shared/common/faults.py:519
+#: shared/common/faults.py:527
 msgid "Value already used!"
 msgstr ""
 
@@ -400,11 +412,11 @@ msgstr ""
 msgid "Editing %s Settings"
 msgstr ""
 
-#: shared/web/geography.py:77
-msgid "Belarus"
+#: shared/web/geography.py:65
+msgid "Burkina Faso"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:344
+#: shared/web/AppointmentsWeb.py:346
 msgid "Week %d of %d"
 msgstr ""
 
@@ -424,7 +436,7 @@ msgstr ""
 msgid "Secret Ballots"
 msgstr ""
 
-#: shared/web/tools.py:574
+#: shared/web/tools.py:567
 msgid "Success"
 msgstr ""
 
@@ -444,11 +456,11 @@ msgstr ""
 msgid "Weightings"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:147
+#: shared/common/VirtualHostsCommon.py:241
 msgid "Enter the title of this virtual host."
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:244
+#: shared/common/VirtualHostsCommon.py:338
 msgid "New Virtual Host"
 msgstr ""
 
@@ -464,6 +476,10 @@ msgstr ""
 msgid "Select the items to subtract."
 msgstr ""
 
+#: profiles/cards.xml.in.h:1
+msgid "Cards Support"
+msgstr ""
+
 #: shared/common/xhtmlgenerator.py:107
 msgid "Use"
 msgstr ""
@@ -536,15 +552,15 @@ msgstr ""
 msgid "Read the License"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:92
-msgid "Pester Absentionnists"
+#: shared/common/faults.py:558
+msgid "Role not in profiles"
 msgstr ""
 
 #: shared/web/TranslationsWeb.py:550 shared/web/TranslationsWeb.py:564
 msgid "%(from)s to %(to)s"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:102 shared/web/UploadFilesWeb.py:71
+#: shared/common/CommentsCommon.py:104 shared/web/UploadFilesWeb.py:71
 #: shared/web/VotesWeb.py:335
 msgid "Comment"
 msgstr ""
@@ -561,11 +577,11 @@ msgstr ""
 msgid "History - %s"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:439
+#: shared/web/AuthenticationLoginPasswordWeb.py:436
 msgid "Create Account for user:"
 msgstr ""
 
-#: shared/common/kinds.py:3696
+#: shared/common/kinds.py:3658
 msgid "Application Token"
 msgstr ""
 
@@ -573,7 +589,7 @@ msgstr ""
 msgid "Sweden"
 msgstr ""
 
-#: shared/common/kinds.py:3337
+#: shared/common/kinds.py:3299
 msgid "Thing"
 msgstr ""
 
@@ -589,7 +605,7 @@ msgstr ""
 msgid "Translatable"
 msgstr ""
 
-#: shared/common/kinds.py:3635 shared/common/kinds.py:3639
+#: shared/common/kinds.py:3597 shared/common/kinds.py:3601
 msgid "Creation Time"
 msgstr ""
 
@@ -609,7 +625,7 @@ msgstr ""
 msgid "Intersection"
 msgstr ""
 
-#: shared/common/kinds.py:3680
+#: shared/common/kinds.py:3642
 msgid "Token"
 msgstr ""
 
@@ -637,7 +653,7 @@ msgstr ""
 msgid "All Objects"
 msgstr ""
 
-#: shared/common/kinds.py:2346
+#: shared/common/kinds.py:2308
 msgid "Enter Twice"
 msgstr ""
 
@@ -645,7 +661,7 @@ msgstr ""
 msgid "Theridion"
 msgstr ""
 
-#: shared/common/faults.py:475
+#: shared/common/faults.py:476
 msgid "Winners group is not empty!"
 msgstr ""
 
@@ -665,7 +681,7 @@ msgstr ""
 msgid "Current Password"
 msgstr ""
 
-#: shared/web/kinds.py:425
+#: shared/web/kinds.py:418
 msgid "Default Values"
 msgstr ""
 
@@ -697,7 +713,7 @@ msgstr ""
 msgid "Select which format you want to type the contents of this document in.  If you are unsure of which format to use, just select SPIP and type the document as you usually do."
 msgstr ""
 
-#: shared/common/kinds.py:2580
+#: shared/common/kinds.py:2542
 msgid "Minimum Number of Items"
 msgstr ""
 
@@ -705,8 +721,8 @@ msgstr ""
 msgid "Saint Lucia"
 msgstr ""
 
-#: shared/common/faults.py:264 shared/common/faults.py:272
-#: shared/common/faults.py:347
+#: shared/common/faults.py:265 shared/common/faults.py:273
+#: shared/common/faults.py:348
 msgid "Wrong value!"
 msgstr ""
 
@@ -738,7 +754,7 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:364 shared/web/VotesWeb.py:755
+#: shared/web/ObjectsWeb.py:368 shared/web/VotesWeb.py:755
 #: shared/web/modes.py:257
 msgid "Editing %s - %s"
 msgstr ""
@@ -747,7 +763,7 @@ msgstr ""
 msgid "All Label"
 msgstr ""
 
-#: shared/web/tools.py:488
+#: shared/web/tools.py:431 shared/web/tools.py:481
 msgid "(missing item)"
 msgstr ""
 
@@ -767,11 +783,15 @@ msgstr ""
 msgid "Viet Nam"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:78
-msgid "Enter the title of your comment."
+#: shared/web/geography.py:194
+msgid "Romania"
 msgstr ""
 
-#: shared/common/kinds.py:1557 shared/common/kinds.py:3809
+#: shared/web/ElectionsWeb.py:368
+msgid "blank vote"
+msgstr ""
+
+#: shared/common/kinds.py:1519 shared/common/kinds.py:3771
 #: shared/web/BrevesWeb.py:71
 msgid "Links"
 msgstr ""
@@ -788,7 +808,7 @@ msgstr ""
 msgid "DIV With Label"
 msgstr ""
 
-#: shared/common/kinds.py:3955
+#: shared/common/kinds.py:3917
 msgid "Value Holder"
 msgstr ""
 
@@ -796,7 +816,7 @@ msgstr ""
 msgid "Jamaica"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:98
+#: shared/common/VirtualHostsCommon.py:158
 msgid "Enter the host name."
 msgstr ""
 
@@ -808,13 +828,12 @@ msgstr ""
 msgid "New Zealand"
 msgstr ""
 
-#: shared/common/kinds.py:2484
+#: shared/common/kinds.py:2446
 msgid "Script"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:398
+#: shared/common/xhtmlgenerator.py:401
 #: shared/web/AuthenticationLoginPasswordWeb.py:384
-#: shared/web/AuthenticationLoginPasswordWeb.py:431
 msgid "Missing Object (%s)"
 msgstr ""
 
@@ -858,7 +877,7 @@ msgstr ""
 msgid "Congo, the Democratic Republic of the"
 msgstr ""
 
-#: shared/web/CommentsWeb.py:105
+#: shared/web/CommentsWeb.py:106
 msgid "Anonymous"
 msgstr ""
 
@@ -866,7 +885,7 @@ msgstr ""
 msgid "New Election"
 msgstr ""
 
-#: shared/common/kinds.py:1678
+#: shared/common/kinds.py:1640
 msgid "Minimum Value"
 msgstr ""
 
@@ -890,12 +909,16 @@ msgstr ""
 msgid "Tonga"
 msgstr ""
 
+#: profiles/comments.xml.in.h:1
+msgid "Comments Support"
+msgstr ""
+
 #: shared/web/ArticlesWeb.py:283
 msgid "DocBook Source - %s"
 msgstr ""
 
 #: shared/web/AuthenticationLoginPasswordWeb.py:359
-#: shared/web/AuthenticationLoginPasswordWeb.py:518
+#: shared/web/AuthenticationLoginPasswordWeb.py:515
 msgid "The password has been sent successfully."
 msgstr ""
 
@@ -907,7 +930,7 @@ msgstr ""
 msgid "Analyze"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:56
+#: shared/common/VirtualHostsCommon.py:58
 msgid "Select the default virtual host to use on this server"
 msgstr ""
 
@@ -929,11 +952,11 @@ msgstr ""
 msgid "New Implementation"
 msgstr ""
 
-#: shared/common/faults.py:248
+#: shared/common/faults.py:249
 msgid "Specified path is not a file!"
 msgstr ""
 
-#: shared/common/kinds.py:2798
+#: shared/common/kinds.py:2760
 msgid "Choose the user(s) of this object."
 msgstr ""
 
@@ -1013,7 +1036,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: shared/common/kinds.py:1687
+#: shared/common/kinds.py:1649
 msgid "Integer Number"
 msgstr ""
 
@@ -1053,7 +1076,7 @@ msgstr ""
 msgid "Member of groups"
 msgstr ""
 
-#: shared/common/kinds.py:3119
+#: shared/common/kinds.py:3081
 msgid "Server Role"
 msgstr ""
 
@@ -1061,12 +1084,12 @@ msgstr ""
 msgid "The account and the user card have been removed successfully."
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:84
+#: shared/common/VirtualHostsCommon.py:144
 msgid "Enter the Glasnost dispatcher id for this virtual host (you may have to consult your administrator)."
 msgstr ""
 
-#: shared/web/ElectionsWeb.py:368
-msgid "blank vote"
+#: templates/pel-infini/infos.xml.in.h:1
+msgid "infini (assoc brest)"
 msgstr ""
 
 #: shared/web/geography.py:166
@@ -1134,10 +1157,6 @@ msgstr ""
 msgid "Israel"
 msgstr ""
 
-#: shared/web/geography.py:228
-msgid "Uganda"
-msgstr ""
-
 #: shared/web/ElectionsWeb.py:350 shared/web/ElectionsWeb.py:366
 msgid "secret"
 msgstr ""
@@ -1269,7 +1288,7 @@ msgstr ""
 msgid "Nicaragua"
 msgstr ""
 
-#: shared/web/UploadFilesWeb.py:352
+#: shared/web/UploadFilesWeb.py:355
 msgid "Your last files"
 msgstr ""
 
@@ -1285,7 +1304,7 @@ msgstr ""
 msgid "Public Ballot"
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:652
+#: shared/web/ObjectsWeb.py:660
 msgid "Id for \"%s\""
 msgstr ""
 
@@ -1293,7 +1312,7 @@ msgstr ""
 msgid "Heading"
 msgstr ""
 
-#: shared/common/kinds.py:3161
+#: shared/common/kinds.py:3123
 msgid "Slot Name"
 msgstr ""
 
@@ -1301,7 +1320,7 @@ msgstr ""
 msgid "New Alias"
 msgstr ""
 
-#: shared/common/kinds.py:3793
+#: shared/common/kinds.py:3755
 msgid "Action"
 msgstr ""
 
@@ -1321,7 +1340,7 @@ msgstr ""
 msgid "Reverse Year Order?"
 msgstr ""
 
-#: shared/common/kinds.py:2741
+#: shared/common/kinds.py:2703
 msgid "Accepted Types"
 msgstr ""
 
@@ -1358,15 +1377,19 @@ msgstr ""
 msgid "Definition"
 msgstr ""
 
+#: profiles/ldap.xml.in.h:1
+msgid "LDAP Support"
+msgstr ""
+
 #: shared/common/CardsCommon.py:607
 msgid "Card"
 msgstr ""
 
-#: shared/common/kinds.py:2852 shared/common/kinds.py:2858
+#: shared/common/kinds.py:2814 shared/common/kinds.py:2820
 msgid "Properties"
 msgstr ""
 
-#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:365
+#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:368
 #: talTranslations.py:6
 msgid "Files"
 msgstr ""
@@ -1415,8 +1438,8 @@ msgstr ""
 msgid "Appointment"
 msgstr ""
 
-#: shared/web/TranslationsWeb.py:125
-msgid "From "
+#: shared/web/ElectionsWeb.py:70
+msgid "Kind of Ballots"
 msgstr ""
 
 #: shared/web/TranslationsWeb.py:232
@@ -1455,10 +1478,6 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
-#: shared/web/geography.py:179
-msgid "Norway"
-msgstr ""
-
 #: shared/common/BrevesCommon.py:199
 msgid "New Short Article"
 msgstr ""
@@ -1483,7 +1502,7 @@ msgstr ""
 msgid "Exclusive Choice"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:101 shared/web/ElectionsWeb.py:316
+#: shared/common/CommentsCommon.py:103 shared/web/ElectionsWeb.py:316
 msgid "comment"
 msgstr ""
 
@@ -1511,7 +1530,7 @@ msgstr ""
 msgid "Malaysia"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:677 shared/web/widgets.py:612
+#: shared/web/AppointmentsWeb.py:680 shared/web/widgets.py:612
 msgid "Month"
 msgstr ""
 
@@ -1527,7 +1546,7 @@ msgstr ""
 msgid "The last system files to administer"
 msgstr ""
 
-#: shared/common/faults.py:549
+#: shared/common/faults.py:550
 msgid "Value too big!"
 msgstr ""
 
@@ -1535,6 +1554,10 @@ msgstr ""
 msgid "<p>The candidate \"<i>%(candidate)s</i>\" beats each of the other candidates.</p><p>The candidate \"<i> %(candidate)s</i>\" wins the election.</p>"
 msgstr ""
 
+#: shared/common/CommentsCommon.py:75
+msgid "Editorial Comment ?"
+msgstr ""
+
 #: shared/common/ArticlesCommon.py:145
 msgid "article"
 msgstr ""
@@ -1547,12 +1570,12 @@ msgstr ""
 msgid "Choose whether to crypt e-mails Glasnost sends to you."
 msgstr ""
 
-#: shared/common/kinds.py:1839
+#: shared/common/kinds.py:1801
 msgid "Mapping"
 msgstr ""
 
-#: templates/linuxdays/infos.xml.in.h:1
-msgid "Luxembourg LinuxDays"
+#: shared/common/VirtualHostsCommon.py:174
+msgid "Usage Profiles"
 msgstr ""
 
 #: shared/web/geography.py:165
@@ -1616,7 +1639,7 @@ msgstr ""
 msgid "Version Number"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:91
+#: shared/web/AppointmentsWeb.py:93
 msgid "Select the people and groups who are assigned to this appointment."
 msgstr ""
 
@@ -1647,6 +1670,14 @@ msgstr ""
 msgid "Table with One-on-One comparisons of the candidates"
 msgstr ""
 
+#: glasnost-web/siteMap.py:69
+msgid "Site Map"
+msgstr ""
+
+#: shared/common/xhtmlgenerator.py:62
+msgid "Abstain"
+msgstr ""
+
 #: shared/web/TranslationsWeb.py:208
 msgid "Good"
 msgstr ""
@@ -1703,7 +1734,7 @@ msgstr ""
 msgid "Your elections being written"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:210
+#: shared/web/AppointmentsWeb.py:212
 msgid "Future events"
 msgstr ""
 
@@ -1791,7 +1822,7 @@ msgstr ""
 msgid "Monaco"
 msgstr ""
 
-#: shared/common/kinds.py:3811
+#: shared/common/kinds.py:3773
 msgid "Push Button"
 msgstr ""
 
@@ -1820,7 +1851,7 @@ msgstr ""
 msgid "Finnish"
 msgstr ""
 
-#: shared/common/kinds.py:2747
+#: shared/common/kinds.py:2709
 msgid "Accepted Roles"
 msgstr ""
 
@@ -1840,7 +1871,7 @@ msgstr ""
 msgid "Argentina"
 msgstr ""
 
-#: shared/common/kinds.py:3781
+#: shared/common/kinds.py:3743
 msgid "Extended Choice"
 msgstr ""
 
@@ -1856,7 +1887,7 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:635
+#: shared/web/AppointmentsWeb.py:638
 msgid "Hour: %s - %s"
 msgstr ""
 
@@ -1864,7 +1895,7 @@ msgstr ""
 msgid "Cuba"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:103
+#: shared/common/CommentsCommon.py:105
 msgid "comments"
 msgstr ""
 
@@ -1896,7 +1927,7 @@ msgstr ""
 msgid "Subject for the \"welcome\" email."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:775
+#: shared/web/ObjectsWeb.py:783
 msgid "Search Results"
 msgstr ""
 
@@ -1920,7 +1951,7 @@ msgstr ""
 msgid "Other Translations"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:124
+#: shared/common/VirtualHostsCommon.py:218
 msgid "Template"
 msgstr ""
 
@@ -1944,8 +1975,7 @@ msgstr ""
 msgid "Malta"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:104 shared/web/ObjectsWeb.py:1206
-#: shared/web/ObjectsWeb.py:1222
+#: shared/common/CommentsCommon.py:106 shared/web/CommentsWeb.py:163
 msgid "Comments"
 msgstr ""
 
@@ -1953,7 +1983,7 @@ msgstr ""
 msgid "Registered Voters:"
 msgstr ""
 
-#: shared/common/kinds.py:3578 shared/web/GroupsWeb.py:88
+#: shared/common/kinds.py:3540 shared/web/GroupsWeb.py:88
 msgid "Union"
 msgstr ""
 
@@ -1973,7 +2003,7 @@ msgstr ""
 msgid "Select the author(s) of the document."
 msgstr ""
 
-#: shared/common/kinds.py:2816
+#: shared/common/kinds.py:2778
 msgid "People Set"
 msgstr ""
 
@@ -2030,12 +2060,16 @@ msgstr ""
 msgid "Egypt"
 msgstr ""
 
+#: profiles/translations.xml.in.h:1
+msgid "Translations Support"
+msgstr ""
+
 #: shared/web/geography.py:121
 msgid "Honduras"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:62
-msgid "Abstain"
+#: shared/web/AuthenticationLoginPasswordWeb.py:513
+msgid "An error occured while sending the password."
 msgstr ""
 
 #: shared/common/translation.py:66
@@ -2046,21 +2080,17 @@ msgstr ""
 msgid "The last system files"
 msgstr ""
 
-#: templates/pel-infini/infos.xml.in.h:1
-msgid "infini (assoc brest)"
-msgstr ""
-
 #: shared/web/PreferencesWeb.py:70
 msgid "Crypt Emails"
 msgstr ""
 
 #: shared/common/xhtmlgenerator.py:85
-#: shared/web/AuthenticationLoginPasswordWeb.py:496
+#: shared/web/AuthenticationLoginPasswordWeb.py:493
 #: shared/web/AuthenticationLdapWeb.py:124 talTranslations.py:14
 msgid "Login"
 msgstr ""
 
-#: shared/common/faults.py:225
+#: shared/common/faults.py:226
 msgid "Invalid email address"
 msgstr ""
 
@@ -2068,7 +2098,7 @@ msgstr ""
 msgid "Guyana"
 msgstr ""
 
-#: shared/common/kinds.py:3909 shared/common/modes.py:188
+#: shared/common/kinds.py:3871 shared/common/modes.py:188
 msgid "Mode"
 msgstr ""
 
@@ -2096,7 +2126,7 @@ msgstr ""
 msgid "Button"
 msgstr ""
 
-#: shared/common/kinds.py:3826
+#: shared/common/kinds.py:3788
 msgid "Fault"
 msgstr ""
 
@@ -2133,7 +2163,7 @@ msgstr ""
 msgid "View Aspect"
 msgstr ""
 
-#: shared/web/UploadFilesWeb.py:359
+#: shared/web/UploadFilesWeb.py:362
 msgid "The last files"
 msgstr ""
 
@@ -2150,7 +2180,7 @@ msgstr ""
 msgid "Germany"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:121
+#: shared/common/VirtualHostsCommon.py:215
 msgid "Select the template (skin) to use for this host."
 msgstr ""
 
@@ -2174,7 +2204,7 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: shared/common/kinds.py:2812 shared/common/kinds.py:2818
+#: shared/common/kinds.py:2774 shared/common/kinds.py:2780
 msgid "Users"
 msgstr ""
 
@@ -2210,7 +2240,7 @@ msgstr ""
 msgid "headings"
 msgstr ""
 
-#: shared/common/kinds.py:3771 shared/common/kinds.py:3773
+#: shared/common/kinds.py:3733 shared/common/kinds.py:3735
 msgid "Writers"
 msgstr ""
 
@@ -2234,7 +2264,7 @@ msgstr ""
 msgid "Winners Grading"
 msgstr ""
 
-#: shared/common/kinds.py:3314
+#: shared/common/kinds.py:3276
 msgid "Access in View Mode"
 msgstr ""
 
@@ -2296,7 +2326,7 @@ msgstr ""
 msgid "Header 6"
 msgstr ""
 
-#: shared/common/faults.py:362
+#: shared/common/faults.py:363
 msgid "Missing value!"
 msgstr ""
 
@@ -2320,6 +2350,10 @@ msgstr ""
 msgid "Enter the text of your comment."
 msgstr ""
 
+#: templates/linuxdays/infos.xml.in.h:1
+msgid "Luxembourg LinuxDays"
+msgstr ""
+
 #: shared/web/geography.py:226
 msgid "Tanzania, United Republic of"
 msgstr ""
@@ -2351,7 +2385,7 @@ msgstr ""
 msgid "Are you sure you want to delete the %s \"%s\" ?"
 msgstr ""
 
-#: shared/common/kinds.py:3764
+#: shared/common/kinds.py:3726
 msgid "Select the people and groups who are allowed to modify the item."
 msgstr ""
 
@@ -2376,7 +2410,7 @@ msgstr ""
 msgid "Gambia"
 msgstr ""
 
-#: shared/common/kinds.py:1755 shared/common/kinds.py:1763
+#: shared/common/kinds.py:1717 shared/common/kinds.py:1725
 msgid "Language"
 msgstr ""
 
@@ -2396,9 +2430,9 @@ msgstr ""
 msgid "Blank Ballots:"
 msgstr ""
 
-#: shared/common/kinds.py:1103 shared/common/kinds.py:1761
-#: shared/common/kinds.py:2482 shared/common/kinds.py:2583
-#: shared/common/kinds.py:3945
+#: shared/common/kinds.py:1103 shared/common/kinds.py:1723
+#: shared/common/kinds.py:2444 shared/common/kinds.py:2545
+#: shared/common/kinds.py:3907
 msgid "Data"
 msgstr ""
 
@@ -2415,7 +2449,7 @@ msgid "Ties"
 msgstr ""
 
 #: shared/common/kinds.py:1315 shared/common/widgets.py:207
-#: shared/web/AppointmentsWeb.py:204 shared/web/AppointmentsWeb.py:216
+#: shared/web/AppointmentsWeb.py:206 shared/web/AppointmentsWeb.py:218
 #: shared/web/ArticlesWeb.py:323
 msgid "Date"
 msgstr ""
@@ -2446,7 +2480,7 @@ msgstr ""
 msgid "Editing Translation"
 msgstr ""
 
-#: shared/common/kinds.py:3800
+#: shared/common/kinds.py:3762
 msgid "Next Mode"
 msgstr ""
 
@@ -2476,11 +2510,11 @@ msgid ""
 "Please backup your changes and redo the edition."
 msgstr ""
 
-#: shared/common/CommentsCommon.py:99
+#: shared/common/CommentsCommon.py:101
 msgid "New Comment"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:469
+#: shared/web/AuthenticationLoginPasswordWeb.py:466
 #: shared/web/AuthenticationLdapWeb.py:99
 msgid "To access this part of the site, you need to sign in."
 msgstr ""
@@ -2493,11 +2527,11 @@ msgstr ""
 msgid "xOctober"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:93
+#: shared/web/AppointmentsWeb.py:95
 msgid "Participants"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:95
+#: shared/web/AppointmentsWeb.py:97
 msgid "Start"
 msgstr ""
 
@@ -2513,8 +2547,8 @@ msgstr ""
 msgid "Dominica"
 msgstr ""
 
-#: shared/web/VotesWeb.py:373
-msgid "Voter"
+#: shared/web/TranslationsWeb.py:125
+msgid "From "
 msgstr ""
 
 #: shared/common/VotesCommon.py:372 shared/web/ElectionsWeb.py:284
@@ -2530,7 +2564,7 @@ msgstr ""
 msgid "(%d words)"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:238
+#: shared/web/AppointmentsWeb.py:240
 msgid "Day long appointments"
 msgstr ""
 
@@ -2550,8 +2584,8 @@ msgstr ""
 msgid "Minimum Year Value Difference to Now"
 msgstr ""
 
-#: shared/common/kinds.py:3805
-msgid "Next Object"
+#: shared/web/geography.py:228
+msgid "Uganda"
 msgstr ""
 
 #: shared/common/RubricsCommon.py:114
@@ -2566,7 +2600,7 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#: shared/common/kinds.py:2573
+#: shared/common/kinds.py:2535
 msgid "Item Type"
 msgstr ""
 
@@ -2594,7 +2628,7 @@ msgstr ""
 msgid "Chad"
 msgstr ""
 
-#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:90
+#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:150
 msgid "Glasnost Dispatcher ID"
 msgstr ""
 
@@ -2662,12 +2696,12 @@ msgstr ""
 msgid "Bolivia"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:248 shared/common/widgets.py:154
+#: shared/common/xhtmlgenerator.py:251 shared/common/widgets.py:154
 #: shared/common/widgets.py:358 shared/web/widgets.py:506
 msgid "None"
 msgstr ""
 
-#: shared/common/kinds.py:2472
+#: shared/common/kinds.py:2434
 msgid "Source Code"
 msgstr ""
 
@@ -2703,7 +2737,7 @@ msgstr ""
 msgid "The results of a never ending election are displayed right from the start. Otherwise, the state of the election must be \"closed\" for the results to be displayed."
 msgstr ""
 
-#: shared/common/faults.py:541
+#: shared/common/faults.py:542
 msgid "Value too small!"
 msgstr ""
 
@@ -2711,6 +2745,10 @@ msgstr ""
 msgid "Link Entry Field"
 msgstr ""
 
+#: profiles/cms.xml.in.h:1
+msgid "Content Management System"
+msgstr ""
+
 #: shared/web/geography.py:178
 msgid "Netherlands"
 msgstr ""
@@ -2728,12 +2766,8 @@ msgstr ""
 msgid "Evaluate"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:516
-msgid "An error occured while sending the password."
-msgstr ""
-
-#: shared/web/geography.py:194
-msgid "Romania"
+#: shared/web/geography.py:77
+msgid "Belarus"
 msgstr ""
 
 #: shared/web/geography.py:176
@@ -2754,7 +2788,7 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#: shared/common/kinds.py:2373
+#: shared/common/kinds.py:2335
 msgid "Python Identifier"
 msgstr ""
 
@@ -2819,11 +2853,11 @@ msgstr ""
 msgid "Multi-Line Field"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:247
+#: shared/common/VirtualHostsCommon.py:341
 msgid "Virtual Host"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:88
+#: shared/web/AppointmentsWeb.py:90
 msgid "End"
 msgstr ""
 
@@ -2852,10 +2886,6 @@ msgstr ""
 msgid "Kenya"
 msgstr ""
 
-#: shared/common/kinds.py:1517
-msgid "Function Name"
-msgstr ""
-
 #: shared/web/geography.py:152
 msgid "Lesotho"
 msgstr ""
@@ -2868,7 +2898,7 @@ msgstr ""
 msgid "Best Average"
 msgstr ""
 
-#: shared/common/kinds.py:3865
+#: shared/common/kinds.py:3827
 msgid "Kind Name"
 msgstr ""
 
@@ -2886,7 +2916,7 @@ msgstr ""
 msgid "Select the people and groups who have administrative powers on this kind of items."
 msgstr ""
 
-#: shared/common/BrevesCommon.py:204 shared/web/tools.py:627
+#: shared/common/BrevesCommon.py:204 shared/web/tools.py:616
 #: shared/web/BrevesWeb.py:168 talTranslations.py:17
 msgid "Short News"
 msgstr ""
@@ -2915,7 +2945,7 @@ msgstr ""
 msgid "The election \"%s\""
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:225 shared/web/AppointmentsWeb.py:683
+#: shared/web/AppointmentsWeb.py:227 shared/web/AppointmentsWeb.py:686
 msgid "Agenda"
 msgstr ""
 
@@ -3027,7 +3057,7 @@ msgstr ""
 msgid "Authentication (LDAP)"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:248
+#: shared/common/VirtualHostsCommon.py:342
 msgid "virtual hosts"
 msgstr ""
 
@@ -3035,7 +3065,7 @@ msgstr ""
 msgid "group"
 msgstr ""
 
-#: shared/common/kinds.py:436 shared/common/kinds.py:3966
+#: shared/common/kinds.py:436 shared/common/kinds.py:3928
 #: shared/common/xhtmlgenerator.py:114 shared/common/modes.py:141
 #: shared/common/widgets.py:80 shared/common/widgets.py:84
 msgid "Widget"
@@ -3049,7 +3079,7 @@ msgstr ""
 msgid "New Forum"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:57
+#: shared/web/AppointmentsWeb.py:59
 msgid "Categories Group"
 msgstr ""
 
@@ -3102,7 +3132,7 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:246
+#: shared/common/VirtualHostsCommon.py:340
 msgid "virtual host"
 msgstr ""
 
@@ -3114,7 +3144,7 @@ msgstr ""
 msgid "Sao Tome and Principe"
 msgstr ""
 
-#: shared/common/kinds.py:2826
+#: shared/common/kinds.py:2788
 msgid "Choose the author(s) for this object."
 msgstr ""
 
@@ -3126,12 +3156,16 @@ msgstr ""
 msgid "Public Ballots"
 msgstr ""
 
-#: shared/common/kinds.py:3946 shared/common/UploadFilesCommon.py:135
+#: shared/common/kinds.py:3908 shared/common/UploadFilesCommon.py:135
 #: shared/common/uploads.py:74 shared/web/UploadFilesWeb.py:77
 #: shared/web/uploads.py:67
 msgid "File"
 msgstr ""
 
+#: shared/common/kinds.py:3812 shared/common/values.py:53
+msgid "Kind"
+msgstr ""
+
 #: shared/common/kinds.py:1267 shared/common/kinds.py:1269
 msgid "Date & Time"
 msgstr ""
@@ -3144,7 +3178,7 @@ msgstr ""
 msgid "Enter the name of this heading."
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:678 shared/web/widgets.py:598
+#: shared/web/AppointmentsWeb.py:681 shared/web/widgets.py:598
 msgid "Year"
 msgstr ""
 
@@ -3154,7 +3188,7 @@ msgstr ""
 
 #: shared/common/xhtmlgenerator.py:90
 #: shared/web/AuthenticationLoginPasswordWeb.py:371
-#: shared/web/AuthenticationLoginPasswordWeb.py:576
+#: shared/web/AuthenticationLoginPasswordWeb.py:573
 msgid "New Account"
 msgstr ""
 
@@ -3206,7 +3240,7 @@ msgstr ""
 msgid "Alias"
 msgstr ""
 
-#: shared/common/kinds.py:3276
+#: shared/common/kinds.py:3238
 msgid "Access in Creation Mode"
 msgstr ""
 
@@ -3230,7 +3264,7 @@ msgstr ""
 msgid "Eritrea"
 msgstr ""
 
-#: shared/common/kinds.py:2462
+#: shared/common/kinds.py:2424
 msgid "Execute On Display"
 msgstr ""
 
@@ -3290,7 +3324,7 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:611
+#: shared/web/AuthenticationLoginPasswordWeb.py:608
 msgid ""
 "The account has successfully been created, but a SMTP error has occurred.\n"
 "Maybe the Mail Transport Agent on the Glasnost server is badly configured."
@@ -3316,7 +3350,7 @@ msgstr ""
 msgid "Suriname"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:58
+#: shared/common/VirtualHostsCommon.py:60
 msgid "Default Virtual Host"
 msgstr ""
 
@@ -3332,7 +3366,7 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#: shared/common/kinds.py:2727
+#: shared/common/kinds.py:2689
 msgid "Select accepted types of items."
 msgstr ""
 
@@ -3344,7 +3378,7 @@ msgstr ""
 msgid "Administrators"
 msgstr ""
 
-#: shared/common/faults.py:240
+#: shared/common/faults.py:241
 msgid "Specified file path does not exist!"
 msgstr ""
 
@@ -3382,7 +3416,7 @@ msgid ""
 msgstr ""
 
 #: shared/common/kinds.py:980 shared/common/kinds.py:1487
-#: shared/common/kinds.py:1685
+#: shared/common/kinds.py:1647
 msgid "Numbers"
 msgstr ""
 
@@ -3417,8 +3451,8 @@ msgstr ""
 
 #: shared/common/ArticlesCommon.py:64 shared/common/kinds.py:378
 #: shared/common/kinds.py:1372 shared/common/kinds.py:1454
-#: shared/common/kinds.py:2353 shared/common/kinds.py:3206
-#: shared/common/kinds.py:3208 shared/web/AppointmentsWeb.py:64
+#: shared/common/kinds.py:2315 shared/common/kinds.py:3168
+#: shared/common/kinds.py:3170 shared/web/AppointmentsWeb.py:66
 #: shared/web/BrevesWeb.py:63 shared/web/CommentsWeb.py:62
 #: shared/web/ArticlesWeb.py:78
 msgid "Text"
@@ -3432,7 +3466,7 @@ msgstr ""
 msgid "hour"
 msgstr ""
 
-#: shared/common/faults.py:133
+#: shared/common/faults.py:134
 msgid "Unknown error"
 msgstr ""
 
@@ -3452,7 +3486,7 @@ msgstr ""
 msgid "Text Format"
 msgstr ""
 
-#: shared/common/kinds.py:1674
+#: shared/common/kinds.py:1636
 msgid "Maximum Value"
 msgstr ""
 
@@ -3507,8 +3541,8 @@ msgstr ""
 msgid "Denmark"
 msgstr ""
 
-#: shared/common/kinds.py:3279 shared/common/kinds.py:3298
-#: shared/common/kinds.py:3316
+#: shared/common/kinds.py:3241 shared/common/kinds.py:3260
+#: shared/common/kinds.py:3278
 msgid "Embedded"
 msgstr ""
 
@@ -3536,7 +3570,7 @@ msgstr ""
 msgid "\"%s\" ImplementationsreadLanguages"
 msgstr ""
 
-#: shared/common/kinds.py:2923
+#: shared/common/kinds.py:2885
 msgid "Select the people and groups who are allowed to read the item."
 msgstr ""
 
@@ -3573,10 +3607,14 @@ msgstr ""
 msgid "short article"
 msgstr ""
 
-#: shared/common/kinds.py:2563
+#: shared/common/kinds.py:2525
 msgid "Minimum Number of Items to Edit"
 msgstr ""
 
+#: profiles/vote.xml.in.h:1
+msgid "Electronic Voting"
+msgstr ""
+
 #: shared/common/kinds.py:1488
 msgid "Float Number"
 msgstr ""
@@ -3625,8 +3663,8 @@ msgstr ""
 msgid "Re-enter your new password."
 msgstr ""
 
-#: shared/common/kinds.py:1783 shared/common/kinds.py:3280
-#: shared/common/kinds.py:3299 shared/common/kinds.py:3317
+#: shared/common/kinds.py:1745 shared/common/kinds.py:3242
+#: shared/common/kinds.py:3261 shared/common/kinds.py:3279
 msgid "Link"
 msgstr ""
 
@@ -3650,7 +3688,7 @@ msgstr ""
 msgid "CRANS"
 msgstr ""
 
-#: shared/common/kinds.py:2930 shared/common/kinds.py:2932
+#: shared/common/kinds.py:2892 shared/common/kinds.py:2894
 msgid "Readers"
 msgstr ""
 
@@ -3698,7 +3736,7 @@ msgstr ""
 msgid "Enter your email address."
 msgstr ""
 
-#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1310
+#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1309
 msgid " (at <%s>)"
 msgstr ""
 
@@ -3726,7 +3764,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: shared/common/faults.py:256
+#: shared/common/faults.py:257
 msgid "Access to file is denied!"
 msgstr ""
 
@@ -3734,7 +3772,7 @@ msgstr ""
 msgid "Singapore"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:101
+#: shared/common/VirtualHostsCommon.py:161
 msgid "Web Host Name"
 msgstr ""
 
@@ -3774,7 +3812,7 @@ msgstr ""
 msgid "<p>The candidates <i>%(candidates)s</i> get the best average ratings.</p> <p>The candidates %(candidates)s win the election.</p>"
 msgstr ""
 
-#: shared/common/kinds.py:3573 shared/web/GroupsWeb.py:114
+#: shared/common/kinds.py:3535 shared/web/GroupsWeb.py:114
 msgid "Items"
 msgstr ""
 
@@ -3790,7 +3828,7 @@ msgstr ""
 msgid "<p>The candidate \"<i>%(candidate)s</i>\" gets the best average rating.</p> <p>The candidate \"<i>%(candidate)s</i>\" wins the election.</p>"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:75
+#: shared/web/AppointmentsWeb.py:77
 msgid "Categories"
 msgstr ""
 
@@ -3799,7 +3837,7 @@ msgid "True"
 msgstr ""
 
 #: shared/common/TranslationsCommon.py:138 shared/web/TranslationsWeb.py:174
-#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:900
+#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:908
 msgid "Translation"
 msgstr ""
 
@@ -3807,15 +3845,15 @@ msgstr ""
 msgid "Entrouvert.com"
 msgstr ""
 
-#: shared/common/kinds.py:3090
+#: shared/common/kinds.py:3052
 msgid "Glasnost Server ID"
 msgstr ""
 
-#: shared/common/kinds.py:3664 shared/common/kinds.py:3668
+#: shared/common/kinds.py:3626 shared/common/kinds.py:3630
 msgid "Modification Time"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:222
+#: shared/web/AppointmentsWeb.py:224
 msgid "Past events"
 msgstr ""
 
@@ -3823,7 +3861,7 @@ msgstr ""
 msgid "HTML"
 msgstr ""
 
-#: shared/common/kinds.py:3296
+#: shared/common/kinds.py:3258
 msgid "Access in Edition Mode"
 msgstr ""
 
@@ -3852,7 +3890,11 @@ msgstr ""
 msgid "preferences"
 msgstr ""
 
-#: shared/web/widgets.py:1871
+#: shared/common/xhtmlgenerator.py:92
+msgid "Pester Absentionnists"
+msgstr ""
+
+#: shared/web/widgets.py:1890
 msgid "other:"
 msgstr ""
 
@@ -3860,15 +3902,15 @@ msgstr ""
 msgid "vote"
 msgstr ""
 
-#: shared/web/ElectionsWeb.py:70
-msgid "Kind of Ballots"
+#: shared/web/geography.py:179
+msgid "Norway"
 msgstr ""
 
 #: shared/web/TranslationsWeb.py:252
 msgid "Translators"
 msgstr ""
 
-#: shared/web/widgets.py:1739
+#: shared/web/widgets.py:1755
 msgid "download"
 msgstr ""
 
@@ -3888,8 +3930,8 @@ msgstr ""
 msgid "Single-Line Text Entry Field"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:205 shared/web/AppointmentsWeb.py:217
-#: shared/web/widgets.py:1872
+#: shared/web/AppointmentsWeb.py:207 shared/web/AppointmentsWeb.py:219
+#: shared/web/widgets.py:1891
 msgid "Label"
 msgstr ""
 
@@ -3934,8 +3976,8 @@ msgstr ""
 msgid "Select the front article of this heading."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:1194
-msgid "No comment."
+#: shared/common/kinds.py:3767
+msgid "Next Object"
 msgstr ""
 
 #: shared/common/modes.py:219
@@ -3958,7 +4000,7 @@ msgstr ""
 msgid "Edition Aspect"
 msgstr ""
 
-#: shared/common/kinds.py:2366
+#: shared/common/kinds.py:2328
 msgid "Invalid values"
 msgstr ""
 
@@ -3966,7 +4008,7 @@ msgstr ""
 msgid "minute"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:675
+#: shared/web/AppointmentsWeb.py:678
 msgid "Week"
 msgstr ""
 
@@ -4026,7 +4068,7 @@ msgstr ""
 msgid "Choose the candidates for this election."
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:673 shared/web/widgets.py:628
+#: shared/web/AppointmentsWeb.py:676 shared/web/widgets.py:628
 msgid "Day"
 msgstr ""
 
@@ -4054,7 +4096,7 @@ msgstr ""
 msgid "Creation Aspect"
 msgstr ""
 
-#: shared/common/kinds.py:1559 shared/common/ObjectsCommon.py:215
+#: shared/common/kinds.py:1521 shared/common/ObjectsCommon.py:215
 msgid "Object"
 msgstr ""
 
@@ -4122,8 +4164,8 @@ msgstr ""
 msgid "Election in progress"
 msgstr ""
 
-#: shared/common/kinds.py:3850 shared/common/values.py:53
-msgid "Kind"
+#: shared/web/CommentsWeb.py:156
+msgid "Editorial Comments"
 msgstr ""
 
 #: shared/common/widgets.py:274
@@ -4142,19 +4184,19 @@ msgstr ""
 msgid "Somalia"
 msgstr ""
 
-#: shared/web/tools.py:633
+#: shared/web/tools.py:622
 msgid "Unknown"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:149 shared/web/AppointmentsWeb.py:97
+#: shared/common/VirtualHostsCommon.py:243 shared/web/AppointmentsWeb.py:99
 #: shared/web/ElectionsWeb.py:128 shared/web/BrevesWeb.py:73
-#: shared/web/CommentsWeb.py:69 shared/web/ForumsWeb.py:71
-#: shared/web/UploadFilesWeb.py:107 shared/web/widgets.py:932
-#: shared/web/ArticlesWeb.py:87 shared/web/SystemFilesWeb.py:82
+#: shared/web/ForumsWeb.py:71 shared/web/UploadFilesWeb.py:107
+#: shared/web/widgets.py:932 shared/web/ArticlesWeb.py:87
+#: shared/web/SystemFilesWeb.py:82
 msgid "Title"
 msgstr ""
 
-#: shared/common/kinds.py:2838 shared/common/kinds.py:2840
+#: shared/common/kinds.py:2800 shared/common/kinds.py:2802
 msgid "Authors"
 msgstr ""
 
diff --git a/po/glasnost-web/sv.po b/po/glasnost-web/sv.po
index 618f3c9a..000e2a61 100644
--- a/po/glasnost-web/sv.po
+++ b/po/glasnost-web/sv.po
@@ -25,7 +25,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glasnost-web $Revision$\n"
-"POT-Creation-Date: Thu Nov  6 13:19:42 2003\n"
+"POT-Creation-Date: Tue Nov 18 16:12:53 2003\n"
 "PO-Revision-Date: 2002-03-29 20:29+0100\n"
 "Last-Translator: Adam Huuva <sventon@easter-eggs.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -38,11 +38,11 @@ msgstr ""
 msgid "in3activa"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:249
+#: shared/common/VirtualHostsCommon.py:343
 msgid "Virtual Hosts"
 msgstr ""
 
-#: shared/common/kinds.py:1742
+#: shared/common/kinds.py:1704
 #, fuzzy
 msgid "Integer Choice"
 msgstr "Väljarnas val"
@@ -90,7 +90,7 @@ msgstr ""
 msgid "New Translation"
 msgstr "Översättare"
 
-#: shared/common/kinds.py:2585
+#: shared/common/kinds.py:2547
 msgid "Sequence"
 msgstr ""
 
@@ -102,10 +102,10 @@ msgstr ""
 msgid "Secret Ballot"
 msgstr "Hemlig röstsedel"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:249
+#: shared/common/CommentsCommon.py:86
 #, fuzzy
-msgid "Changing User Password"
-msgstr "Ändra lösenord"
+msgid "some comment"
+msgstr "kommentar"
 
 #: shared/common/ElectionsCommon.py:144
 msgid "Choose the persons or groups who will vote for this election."
@@ -115,7 +115,7 @@ msgstr ""
 msgid "Cyprus"
 msgstr ""
 
-#: shared/common/kinds.py:222 shared/common/kinds.py:3278
+#: shared/common/kinds.py:222 shared/common/kinds.py:3240
 msgid "Same As Edition Mode"
 msgstr ""
 
@@ -128,11 +128,11 @@ msgstr "Icke-medlem"
 msgid "Check Box"
 msgstr ""
 
-#: shared/common/kinds.py:2467
+#: shared/common/kinds.py:2429
 msgid "Execute On Submit"
 msgstr ""
 
-#: shared/common/kinds.py:3703
+#: shared/common/kinds.py:3665
 #, fuzzy
 msgid "User Token"
 msgstr "Väljarpolett"
@@ -157,6 +157,11 @@ msgstr "Redigera"
 msgid "New Heading"
 msgstr "Ny placering"
 
+#: shared/web/AuthenticationLoginPasswordWeb.py:249
+#, fuzzy
+msgid "Changing User Password"
+msgstr "Ändra lösenord"
+
 #: shared/web/calendaring.py:60
 msgid "February"
 msgstr ""
@@ -165,7 +170,7 @@ msgstr ""
 msgid "Liberia"
 msgstr ""
 
-#: shared/common/kinds.py:3253
+#: shared/common/kinds.py:3215
 msgid "Structure"
 msgstr ""
 
@@ -174,7 +179,7 @@ msgid "Saint Kitts and Nevis"
 msgstr ""
 
 #: shared/common/AuthenticationLoginPasswordCommon.py:64
-#: shared/common/kinds.py:2355 shared/common/AuthenticationLdapCommon.py:63
+#: shared/common/kinds.py:2317 shared/common/AuthenticationLdapCommon.py:63
 #: shared/web/AuthenticationLoginPasswordWeb.py:69
 #: shared/web/AuthenticationLoginPasswordWeb.py:146
 msgid "Password"
@@ -221,13 +226,13 @@ msgstr ""
 msgid "Counting of the Votes"
 msgstr "Rösträkning"
 
-#: shared/common/kinds.py:2536
+#: shared/common/kinds.py:2498
 msgid "Script Source Code"
 msgstr ""
 
-#: shared/web/geography.py:65
-msgid "Burkina Faso"
-msgstr ""
+#: shared/web/VotesWeb.py:373
+msgid "Voter"
+msgstr "Väljare"
 
 #: shared/common/kinds.py:97
 #, fuzzy
@@ -292,11 +297,11 @@ msgstr "
 msgid "Add %s To Rubric"
 msgstr ""
 
-#: shared/web/GlasnostTALInterpreter.py:64
+#: shared/web/GlasnostTALInterpreter.py:67
 msgid "Error in generated HTML"
 msgstr ""
 
-#: shared/common/kinds.py:1749
+#: shared/common/kinds.py:1711
 #, fuzzy
 msgid "Select the language used to fill in this card."
 msgstr "Välj en kandidat att lägga till"
@@ -385,11 +390,16 @@ msgstr "Se k
 msgid "files"
 msgstr "filer"
 
-#: shared/common/kinds.py:3980
+#: shared/common/kinds.py:3942
 #, fuzzy
 msgid "Widget Name"
 msgstr "Bredd"
 
+#: shared/web/CommentsWeb.py:168
+#, fuzzy
+msgid "Add Comment"
+msgstr "Kommentar"
+
 #: shared/web/TranslationsWeb.py:165 shared/web/TranslationsWeb.py:612
 #: shared/web/GradesWeb.py:85 shared/web/widgets.py:152
 #: shared/web/widgets.py:932 shared/web/widgets.py:938
@@ -421,15 +431,20 @@ msgstr "Anv
 msgid "Vote Blank"
 msgstr "Blank röst"
 
+#: profiles/basic.xml.in.h:1
+#, fuzzy
+msgid "Basic Functionalities"
+msgstr "Ringt telefonsamtal"
+
 #: shared/web/AuthenticationLoginPasswordWeb.py:302
 #, fuzzy
 msgid "Delete Account"
 msgstr "Nytt användarkonto"
 
-#: shared/common/faults.py:324 shared/common/faults.py:486
-#: shared/common/faults.py:494 shared/common/faults.py:502
-#: shared/common/faults.py:510 shared/common/faults.py:518
-#: shared/common/faults.py:526
+#: shared/common/faults.py:325 shared/common/faults.py:487
+#: shared/common/faults.py:495 shared/common/faults.py:503
+#: shared/common/faults.py:511 shared/common/faults.py:519
+#: shared/common/faults.py:527
 msgid "Value already used!"
 msgstr "Värde redan använt!"
 
@@ -445,11 +460,11 @@ msgstr ""
 msgid "Editing %s Settings"
 msgstr "Ändra inställningar - %s"
 
-#: shared/web/geography.py:77
-msgid "Belarus"
+#: shared/web/geography.py:65
+msgid "Burkina Faso"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:344
+#: shared/web/AppointmentsWeb.py:346
 msgid "Week %d of %d"
 msgstr ""
 
@@ -471,7 +486,7 @@ msgstr "Systemfil"
 msgid "Secret Ballots"
 msgstr "Hemliga röstsedlar"
 
-#: shared/web/tools.py:574
+#: shared/web/tools.py:567
 msgid "Success"
 msgstr "Lyckad"
 
@@ -493,12 +508,12 @@ msgstr "V
 msgid "Weightings"
 msgstr "Vikter"
 
-#: shared/common/VirtualHostsCommon.py:147
+#: shared/common/VirtualHostsCommon.py:241
 #, fuzzy
 msgid "Enter the title of this virtual host."
 msgstr "De senaste artiklarna"
 
-#: shared/common/VirtualHostsCommon.py:244
+#: shared/common/VirtualHostsCommon.py:338
 #, fuzzy
 msgid "New Virtual Host"
 msgstr "Röst - %s"
@@ -517,6 +532,11 @@ msgstr "Avst
 msgid "Select the items to subtract."
 msgstr "Välj en kandidat att lägga till"
 
+#: profiles/cards.xml.in.h:1
+#, fuzzy
+msgid "Cards Support"
+msgstr "Översättare"
+
 #: shared/common/xhtmlgenerator.py:107
 #, fuzzy
 msgid "Use"
@@ -596,16 +616,16 @@ msgstr "
 msgid "Read the License"
 msgstr "Läs licensen"
 
-#: shared/common/xhtmlgenerator.py:92
+#: shared/common/faults.py:558
 #, fuzzy
-msgid "Pester Absentionnists"
-msgstr "Avstående:"
+msgid "Role not in profiles"
+msgstr "Aktiv omröstning"
 
 #: shared/web/TranslationsWeb.py:550 shared/web/TranslationsWeb.py:564
 msgid "%(from)s to %(to)s"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:102 shared/web/UploadFilesWeb.py:71
+#: shared/common/CommentsCommon.py:104 shared/web/UploadFilesWeb.py:71
 #: shared/web/VotesWeb.py:335
 msgid "Comment"
 msgstr "Kommentar"
@@ -622,12 +642,12 @@ msgstr ""
 msgid "History - %s"
 msgstr "Historik - %s"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:439
+#: shared/web/AuthenticationLoginPasswordWeb.py:436
 #, fuzzy
 msgid "Create Account for user:"
 msgstr "Nytt användarkonto"
 
-#: shared/common/kinds.py:3696
+#: shared/common/kinds.py:3658
 #, fuzzy
 msgid "Application Token"
 msgstr "Omröstningspolett"
@@ -637,7 +657,7 @@ msgstr "Omr
 msgid "Sweden"
 msgstr "Svenska"
 
-#: shared/common/kinds.py:3337
+#: shared/common/kinds.py:3299
 #, fuzzy
 msgid "Thing"
 msgstr "rubrik"
@@ -656,7 +676,7 @@ msgstr ""
 msgid "Translatable"
 msgstr "Översättare"
 
-#: shared/common/kinds.py:3635 shared/common/kinds.py:3639
+#: shared/common/kinds.py:3597 shared/common/kinds.py:3601
 msgid "Creation Time"
 msgstr "Datum vid skapande"
 
@@ -678,7 +698,7 @@ msgstr ""
 msgid "Intersection"
 msgstr "Översättare"
 
-#: shared/common/kinds.py:3680
+#: shared/common/kinds.py:3642
 #, fuzzy
 msgid "Token"
 msgstr "Röstpolett"
@@ -711,7 +731,7 @@ msgstr "Mime-typ"
 msgid "All Objects"
 msgstr "Alla objekt"
 
-#: shared/common/kinds.py:2346
+#: shared/common/kinds.py:2308
 #, fuzzy
 msgid "Enter Twice"
 msgstr "Väljarnas val"
@@ -721,7 +741,7 @@ msgstr "V
 msgid "Theridion"
 msgstr "Version:"
 
-#: shared/common/faults.py:475
+#: shared/common/faults.py:476
 #, fuzzy
 msgid "Winners group is not empty!"
 msgstr "Vinnargrupp"
@@ -744,7 +764,7 @@ msgstr "Misslyckades"
 msgid "Current Password"
 msgstr "Ändra lösenord"
 
-#: shared/web/kinds.py:425
+#: shared/web/kinds.py:418
 #, fuzzy
 msgid "Default Values"
 msgstr "Standardgrupp"
@@ -781,7 +801,7 @@ msgid ""
 "document as you usually do."
 msgstr ""
 
-#: shared/common/kinds.py:2580
+#: shared/common/kinds.py:2542
 msgid "Minimum Number of Items"
 msgstr ""
 
@@ -789,8 +809,8 @@ msgstr ""
 msgid "Saint Lucia"
 msgstr ""
 
-#: shared/common/faults.py:264 shared/common/faults.py:272
-#: shared/common/faults.py:347
+#: shared/common/faults.py:265 shared/common/faults.py:273
+#: shared/common/faults.py:348
 msgid "Wrong value!"
 msgstr "Felaktigt värde!"
 
@@ -822,7 +842,7 @@ msgstr "GnuPG fingeravtryck"
 msgid "Find"
 msgstr "Sök"
 
-#: shared/web/ObjectsWeb.py:364 shared/web/VotesWeb.py:755
+#: shared/web/ObjectsWeb.py:368 shared/web/VotesWeb.py:755
 #: shared/web/modes.py:257
 #, fuzzy
 msgid "Editing %s - %s"
@@ -833,7 +853,7 @@ msgstr "
 msgid "All Label"
 msgstr "atomer"
 
-#: shared/web/tools.py:488
+#: shared/web/tools.py:431 shared/web/tools.py:481
 msgid "(missing item)"
 msgstr ""
 
@@ -854,12 +874,15 @@ msgstr ""
 msgid "Viet Nam"
 msgstr "Bredd"
 
-#: shared/common/CommentsCommon.py:78
-#, fuzzy
-msgid "Enter the title of your comment."
-msgstr "De senaste artiklarna"
+#: shared/web/geography.py:194
+msgid "Romania"
+msgstr ""
 
-#: shared/common/kinds.py:1557 shared/common/kinds.py:3809
+#: shared/web/ElectionsWeb.py:368
+msgid "blank vote"
+msgstr "blankröst"
+
+#: shared/common/kinds.py:1519 shared/common/kinds.py:3771
 #: shared/web/BrevesWeb.py:71
 msgid "Links"
 msgstr "Länkar"
@@ -878,7 +901,7 @@ msgstr "OK"
 msgid "DIV With Label"
 msgstr "atomer"
 
-#: shared/common/kinds.py:3955
+#: shared/common/kinds.py:3917
 msgid "Value Holder"
 msgstr ""
 
@@ -886,7 +909,7 @@ msgstr ""
 msgid "Jamaica"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:98
+#: shared/common/VirtualHostsCommon.py:158
 msgid "Enter the host name."
 msgstr ""
 
@@ -899,13 +922,12 @@ msgstr "Ta bort"
 msgid "New Zealand"
 msgstr "Ny Rubrik"
 
-#: shared/common/kinds.py:2484
+#: shared/common/kinds.py:2446
 msgid "Script"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:398
+#: shared/common/xhtmlgenerator.py:401
 #: shared/web/AuthenticationLoginPasswordWeb.py:384
-#: shared/web/AuthenticationLoginPasswordWeb.py:431
 msgid "Missing Object (%s)"
 msgstr ""
 
@@ -957,7 +979,7 @@ msgstr ""
 msgid "Congo, the Democratic Republic of the"
 msgstr ""
 
-#: shared/web/CommentsWeb.py:105
+#: shared/web/CommentsWeb.py:106
 msgid "Anonymous"
 msgstr ""
 
@@ -966,7 +988,7 @@ msgstr ""
 msgid "New Election"
 msgstr "omröstning"
 
-#: shared/common/kinds.py:1678
+#: shared/common/kinds.py:1640
 msgid "Minimum Value"
 msgstr ""
 
@@ -995,12 +1017,17 @@ msgstr "L
 msgid "Tonga"
 msgstr "Röstpolett"
 
+#: profiles/comments.xml.in.h:1
+#, fuzzy
+msgid "Comments Support"
+msgstr "Översättare"
+
 #: shared/web/ArticlesWeb.py:283
 msgid "DocBook Source - %s"
 msgstr "DocBook källa - %s"
 
 #: shared/web/AuthenticationLoginPasswordWeb.py:359
-#: shared/web/AuthenticationLoginPasswordWeb.py:518
+#: shared/web/AuthenticationLoginPasswordWeb.py:515
 #, fuzzy
 msgid "The password has been sent successfully."
 msgstr "Lösenordet har skickats med e-post till %s!"
@@ -1013,7 +1040,7 @@ msgstr "F
 msgid "Analyze"
 msgstr "Analys"
 
-#: shared/common/VirtualHostsCommon.py:56
+#: shared/common/VirtualHostsCommon.py:58
 #, fuzzy
 msgid "Select the default virtual host to use on this server"
 msgstr "De senaste filerna att administrera"
@@ -1038,11 +1065,11 @@ msgstr ""
 msgid "New Implementation"
 msgstr "Ny organisation"
 
-#: shared/common/faults.py:248
+#: shared/common/faults.py:249
 msgid "Specified path is not a file!"
 msgstr "Den angivna åtkomstvägen pekar inte på en fil!"
 
-#: shared/common/kinds.py:2798
+#: shared/common/kinds.py:2760
 #, fuzzy
 msgid "Choose the user(s) of this object."
 msgstr "De avslutade omröstningarnas röster"
@@ -1130,7 +1157,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: shared/common/kinds.py:1687
+#: shared/common/kinds.py:1649
 msgid "Integer Number"
 msgstr ""
 
@@ -1175,7 +1202,7 @@ msgstr ""
 msgid "Member of groups"
 msgstr "Medlemmar"
 
-#: shared/common/kinds.py:3119
+#: shared/common/kinds.py:3081
 msgid "Server Role"
 msgstr ""
 
@@ -1184,15 +1211,15 @@ msgstr ""
 msgid "The account and the user card have been removed successfully."
 msgstr "Lösenordet har skickats med e-post till %s!"
 
-#: shared/common/VirtualHostsCommon.py:84
+#: shared/common/VirtualHostsCommon.py:144
 msgid ""
 "Enter the Glasnost dispatcher id for this virtual host (you may have to "
 "consult your administrator)."
 msgstr ""
 
-#: shared/web/ElectionsWeb.py:368
-msgid "blank vote"
-msgstr "blankröst"
+#: templates/pel-infini/infos.xml.in.h:1
+msgid "infini (assoc brest)"
+msgstr ""
 
 #: shared/web/geography.py:166
 msgid "Mauritania"
@@ -1263,10 +1290,6 @@ msgstr ""
 msgid "Israel"
 msgstr ""
 
-#: shared/web/geography.py:228
-msgid "Uganda"
-msgstr ""
-
 #: shared/web/ElectionsWeb.py:350 shared/web/ElectionsWeb.py:366
 msgid "secret"
 msgstr "hemlig"
@@ -1414,7 +1437,7 @@ msgstr "Standardgrupp"
 msgid "Nicaragua"
 msgstr ""
 
-#: shared/web/UploadFilesWeb.py:352
+#: shared/web/UploadFilesWeb.py:355
 msgid "Your last files"
 msgstr "Dina senaste filer"
 
@@ -1431,7 +1454,7 @@ msgstr "
 msgid "Public Ballot"
 msgstr "Öppen röstsedel"
 
-#: shared/web/ObjectsWeb.py:652
+#: shared/web/ObjectsWeb.py:660
 msgid "Id for \"%s\""
 msgstr ""
 
@@ -1439,7 +1462,7 @@ msgstr ""
 msgid "Heading"
 msgstr "Rubrik"
 
-#: shared/common/kinds.py:3161
+#: shared/common/kinds.py:3123
 #, fuzzy
 msgid "Slot Name"
 msgstr "Förnamn"
@@ -1449,7 +1472,7 @@ msgstr "F
 msgid "New Alias"
 msgstr "Ny"
 
-#: shared/common/kinds.py:3793
+#: shared/common/kinds.py:3755
 #, fuzzy
 msgid "Action"
 msgstr "omröstning"
@@ -1472,7 +1495,7 @@ msgstr "Ny"
 msgid "Reverse Year Order?"
 msgstr ""
 
-#: shared/common/kinds.py:2741
+#: shared/common/kinds.py:2703
 msgid "Accepted Types"
 msgstr ""
 
@@ -1513,17 +1536,21 @@ msgstr "Tyska"
 msgid "Definition"
 msgstr "omröstning"
 
+#: profiles/ldap.xml.in.h:1
+msgid "LDAP Support"
+msgstr ""
+
 #: shared/common/CardsCommon.py:607
 #, fuzzy
 msgid "Card"
 msgstr "Skapa"
 
-#: shared/common/kinds.py:2852 shared/common/kinds.py:2858
+#: shared/common/kinds.py:2814 shared/common/kinds.py:2820
 #, fuzzy
 msgid "Properties"
 msgstr "Organisationer"
 
-#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:365
+#: shared/common/UploadFilesCommon.py:137 shared/web/UploadFilesWeb.py:368
 #: talTranslations.py:6
 msgid "Files"
 msgstr "Filer"
@@ -1578,9 +1605,9 @@ msgstr ""
 msgid "Appointment"
 msgstr "Innehåll"
 
-#: shared/web/TranslationsWeb.py:125
-msgid "From "
-msgstr ""
+#: shared/web/ElectionsWeb.py:70
+msgid "Kind of Ballots"
+msgstr "Röstsedlarnas typ"
 
 #: shared/web/TranslationsWeb.py:232
 #, fuzzy
@@ -1621,10 +1648,6 @@ msgstr "De senaste avslutade omr
 msgid "Luxembourg"
 msgstr ""
 
-#: shared/web/geography.py:179
-msgid "Norway"
-msgstr ""
-
 #: shared/common/BrevesCommon.py:199
 #, fuzzy
 msgid "New Short Article"
@@ -1651,7 +1674,7 @@ msgstr ""
 msgid "Exclusive Choice"
 msgstr "Väljarnas val"
 
-#: shared/common/CommentsCommon.py:101 shared/web/ElectionsWeb.py:316
+#: shared/common/CommentsCommon.py:103 shared/web/ElectionsWeb.py:316
 msgid "comment"
 msgstr "kommentar"
 
@@ -1682,7 +1705,7 @@ msgstr "Titel"
 msgid "Malaysia"
 msgstr "Misslyckades"
 
-#: shared/web/AppointmentsWeb.py:677 shared/web/widgets.py:612
+#: shared/web/AppointmentsWeb.py:680 shared/web/widgets.py:612
 msgid "Month"
 msgstr ""
 
@@ -1699,7 +1722,7 @@ msgstr ""
 msgid "The last system files to administer"
 msgstr "De senaste systemfilerna att administrera"
 
-#: shared/common/faults.py:549
+#: shared/common/faults.py:550
 msgid "Value too big!"
 msgstr "Värde för stort!"
 
@@ -1712,6 +1735,11 @@ msgstr ""
 "<p>Kandidaten \"<i>%(candidate)s</i>\" besegrar varje annan kandidat.</"
 "p><p>Kandidaten \"<i>%(candidate)s</i>\" vinner valet.</p>"
 
+#: shared/common/CommentsCommon.py:75
+#, fuzzy
+msgid "Editorial Comment ?"
+msgstr "Kommentar"
+
 #: shared/common/ArticlesCommon.py:145
 msgid "article"
 msgstr "artikel"
@@ -1724,14 +1752,15 @@ msgstr ""
 msgid "Choose whether to crypt e-mails Glasnost sends to you."
 msgstr ""
 
-#: shared/common/kinds.py:1839
+#: shared/common/kinds.py:1801
 #, fuzzy
 msgid "Mapping"
 msgstr "Medelvärde"
 
-#: templates/linuxdays/infos.xml.in.h:1
-msgid "Luxembourg LinuxDays"
-msgstr ""
+#: shared/common/VirtualHostsCommon.py:174
+#, fuzzy
+msgid "Usage Profiles"
+msgstr "systemfiler"
 
 #: shared/web/geography.py:165
 msgid "Mongolia"
@@ -1802,7 +1831,7 @@ msgstr "Medlemmar"
 msgid "Version Number"
 msgstr "Version:"
 
-#: shared/web/AppointmentsWeb.py:91
+#: shared/web/AppointmentsWeb.py:93
 msgid "Select the people and groups who are assigned to this appointment."
 msgstr ""
 
@@ -1833,6 +1862,14 @@ msgstr ""
 msgid "Table with One-on-One comparisons of the candidates"
 msgstr ""
 
+#: glasnost-web/siteMap.py:69
+msgid "Site Map"
+msgstr ""
+
+#: shared/common/xhtmlgenerator.py:62
+msgid "Abstain"
+msgstr "Avstå"
+
 #: shared/web/TranslationsWeb.py:208
 msgid "Good"
 msgstr ""
@@ -1898,7 +1935,7 @@ msgstr "
 msgid "Your elections being written"
 msgstr "Dina omröstningar under redigering"
 
-#: shared/web/AppointmentsWeb.py:210
+#: shared/web/AppointmentsWeb.py:212
 #, fuzzy
 msgid "Future events"
 msgstr "Mottagare"
@@ -1990,7 +2027,7 @@ msgstr ""
 msgid "Monaco"
 msgstr "Kontakt"
 
-#: shared/common/kinds.py:3811
+#: shared/common/kinds.py:3773
 #, fuzzy
 msgid "Push Button"
 msgstr "Öppen röstsedel"
@@ -2021,7 +2058,7 @@ msgstr "
 msgid "Finnish"
 msgstr "Finska"
 
-#: shared/common/kinds.py:2747
+#: shared/common/kinds.py:2709
 msgid "Accepted Roles"
 msgstr ""
 
@@ -2043,7 +2080,7 @@ msgstr ""
 msgid "Argentina"
 msgstr "Avstående"
 
-#: shared/common/kinds.py:3781
+#: shared/common/kinds.py:3743
 #, fuzzy
 msgid "Extended Choice"
 msgstr "Väljarnas val"
@@ -2063,7 +2100,7 @@ msgstr ""
 msgid "Others"
 msgstr "Väljare"
 
-#: shared/web/AppointmentsWeb.py:635
+#: shared/web/AppointmentsWeb.py:638
 #, fuzzy
 msgid "Hour: %s - %s"
 msgstr "Person - %s"
@@ -2072,7 +2109,7 @@ msgstr "Person - %s"
 msgid "Cuba"
 msgstr ""
 
-#: shared/common/CommentsCommon.py:103
+#: shared/common/CommentsCommon.py:105
 #, fuzzy
 msgid "comments"
 msgstr "kommentar"
@@ -2107,7 +2144,7 @@ msgstr "R
 msgid "Subject for the \"welcome\" email."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:775
+#: shared/web/ObjectsWeb.py:783
 #, fuzzy
 msgid "Search Results"
 msgstr "Resultat"
@@ -2134,7 +2171,7 @@ msgstr ""
 msgid "Other Translations"
 msgstr "Översättare"
 
-#: shared/common/VirtualHostsCommon.py:124
+#: shared/common/VirtualHostsCommon.py:218
 msgid "Template"
 msgstr ""
 
@@ -2161,8 +2198,7 @@ msgstr "Bredd"
 msgid "Malta"
 msgstr "data"
 
-#: shared/common/CommentsCommon.py:104 shared/web/ObjectsWeb.py:1206
-#: shared/web/ObjectsWeb.py:1222
+#: shared/common/CommentsCommon.py:106 shared/web/CommentsWeb.py:163
 #, fuzzy
 msgid "Comments"
 msgstr "Kommentar"
@@ -2171,7 +2207,7 @@ msgstr "Kommentar"
 msgid "Registered Voters:"
 msgstr "Registrerade väljare:"
 
-#: shared/common/kinds.py:3578 shared/web/GroupsWeb.py:88
+#: shared/common/kinds.py:3540 shared/web/GroupsWeb.py:88
 #, fuzzy
 msgid "Union"
 msgstr "Okänd"
@@ -2192,7 +2228,7 @@ msgstr "systemfiler"
 msgid "Select the author(s) of the document."
 msgstr ""
 
-#: shared/common/kinds.py:2816
+#: shared/common/kinds.py:2778
 #, fuzzy
 msgid "People Set"
 msgstr "Personer"
@@ -2254,13 +2290,19 @@ msgstr "Anv
 msgid "Egypt"
 msgstr ""
 
+#: profiles/translations.xml.in.h:1
+#, fuzzy
+msgid "Translations Support"
+msgstr "Översättare"
+
 #: shared/web/geography.py:121
 msgid "Honduras"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:62
-msgid "Abstain"
-msgstr "Avstå"
+#: shared/web/AuthenticationLoginPasswordWeb.py:513
+#, fuzzy
+msgid "An error occured while sending the password."
+msgstr "Översättare"
 
 #: shared/common/translation.py:66
 msgid "Portuguese"
@@ -2270,21 +2312,17 @@ msgstr ""
 msgid "The last system files"
 msgstr "De senaste systemfilerna"
 
-#: templates/pel-infini/infos.xml.in.h:1
-msgid "infini (assoc brest)"
-msgstr ""
-
 #: shared/web/PreferencesWeb.py:70
 msgid "Crypt Emails"
 msgstr "Kryptera e-post"
 
 #: shared/common/xhtmlgenerator.py:85
-#: shared/web/AuthenticationLoginPasswordWeb.py:496
+#: shared/web/AuthenticationLoginPasswordWeb.py:493
 #: shared/web/AuthenticationLdapWeb.py:124 talTranslations.py:14
 msgid "Login"
 msgstr "Anknytnings-ID"
 
-#: shared/common/faults.py:225
+#: shared/common/faults.py:226
 msgid "Invalid email address"
 msgstr ""
 
@@ -2293,7 +2331,7 @@ msgstr ""
 msgid "Guyana"
 msgstr "Tyska"
 
-#: shared/common/kinds.py:3909 shared/common/modes.py:188
+#: shared/common/kinds.py:3871 shared/common/modes.py:188
 #, fuzzy
 msgid "Mode"
 msgstr "Väljarpolett"
@@ -2324,7 +2362,7 @@ msgstr "objekt"
 msgid "Button"
 msgstr "Öppen röstsedel"
 
-#: shared/common/kinds.py:3826
+#: shared/common/kinds.py:3788
 #, fuzzy
 msgid "Fault"
 msgstr "Misslyckades"
@@ -2367,7 +2405,7 @@ msgstr ""
 msgid "View Aspect"
 msgstr "Oavgjorda"
 
-#: shared/web/UploadFilesWeb.py:359
+#: shared/web/UploadFilesWeb.py:362
 msgid "The last files"
 msgstr "De senaste filerna"
 
@@ -2386,7 +2424,7 @@ msgstr ""
 msgid "Germany"
 msgstr "Tyska"
 
-#: shared/common/VirtualHostsCommon.py:121
+#: shared/common/VirtualHostsCommon.py:215
 msgid "Select the template (skin) to use for this host."
 msgstr ""
 
@@ -2413,7 +2451,7 @@ msgstr "Inst
 msgid "April"
 msgstr "Artikel"
 
-#: shared/common/kinds.py:2812 shared/common/kinds.py:2818
+#: shared/common/kinds.py:2774 shared/common/kinds.py:2780
 #, fuzzy
 msgid "Users"
 msgstr "Användare:"
@@ -2450,7 +2488,7 @@ msgstr ""
 msgid "headings"
 msgstr "rubriker"
 
-#: shared/common/kinds.py:3771 shared/common/kinds.py:3773
+#: shared/common/kinds.py:3733 shared/common/kinds.py:3735
 msgid "Writers"
 msgstr "Redigerare"
 
@@ -2477,7 +2515,7 @@ msgstr "Omr
 msgid "Winners Grading"
 msgstr "Vinnarnas placering"
 
-#: shared/common/kinds.py:3314
+#: shared/common/kinds.py:3276
 #, fuzzy
 msgid "Access in View Mode"
 msgstr "Editeringstid"
@@ -2547,7 +2585,7 @@ msgstr "L
 msgid "Header 6"
 msgstr "Läsare"
 
-#: shared/common/faults.py:362
+#: shared/common/faults.py:363
 msgid "Missing value!"
 msgstr "Värde saknas!"
 
@@ -2574,6 +2612,10 @@ msgstr "Kortnyhet"
 msgid "Enter the text of your comment."
 msgstr "De senaste artiklarna"
 
+#: templates/linuxdays/infos.xml.in.h:1
+msgid "Luxembourg LinuxDays"
+msgstr ""
+
 #: shared/web/geography.py:226
 msgid "Tanzania, United Republic of"
 msgstr ""
@@ -2608,7 +2650,7 @@ msgstr ""
 msgid "Are you sure you want to delete the %s \"%s\" ?"
 msgstr "Är du säker på att du vill ta bort posten?"
 
-#: shared/common/kinds.py:3764
+#: shared/common/kinds.py:3726
 msgid "Select the people and groups who are allowed to modify the item."
 msgstr ""
 
@@ -2634,7 +2676,7 @@ msgstr ""
 msgid "Gambia"
 msgstr ""
 
-#: shared/common/kinds.py:1755 shared/common/kinds.py:1763
+#: shared/common/kinds.py:1717 shared/common/kinds.py:1725
 msgid "Language"
 msgstr "Språk"
 
@@ -2656,9 +2698,9 @@ msgstr ""
 msgid "Blank Ballots:"
 msgstr "Blanka röstsedlar:"
 
-#: shared/common/kinds.py:1103 shared/common/kinds.py:1761
-#: shared/common/kinds.py:2482 shared/common/kinds.py:2583
-#: shared/common/kinds.py:3945
+#: shared/common/kinds.py:1103 shared/common/kinds.py:1723
+#: shared/common/kinds.py:2444 shared/common/kinds.py:2545
+#: shared/common/kinds.py:3907
 #, fuzzy
 msgid "Data"
 msgstr "Tillstånd"
@@ -2676,7 +2718,7 @@ msgid "Ties"
 msgstr "Oavgjorda"
 
 #: shared/common/kinds.py:1315 shared/common/widgets.py:207
-#: shared/web/AppointmentsWeb.py:204 shared/web/AppointmentsWeb.py:216
+#: shared/web/AppointmentsWeb.py:206 shared/web/AppointmentsWeb.py:218
 #: shared/web/ArticlesWeb.py:323
 #, fuzzy
 msgid "Date"
@@ -2713,7 +2755,7 @@ msgstr "Nytt anv
 msgid "Editing Translation"
 msgstr "Översättare"
 
-#: shared/common/kinds.py:3800
+#: shared/common/kinds.py:3762
 #, fuzzy
 msgid "Next Mode"
 msgstr "Väljarpolett"
@@ -2748,12 +2790,12 @@ msgid ""
 "Please backup your changes and redo the edition."
 msgstr ""
 
-#: shared/common/CommentsCommon.py:99
+#: shared/common/CommentsCommon.py:101
 #, fuzzy
 msgid "New Comment"
 msgstr "Kommentar"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:469
+#: shared/web/AuthenticationLoginPasswordWeb.py:466
 #: shared/web/AuthenticationLdapWeb.py:99
 msgid "To access this part of the site, you need to sign in."
 msgstr ""
@@ -2767,12 +2809,12 @@ msgstr "Anv
 msgid "xOctober"
 msgstr "Väljare"
 
-#: shared/web/AppointmentsWeb.py:93
+#: shared/web/AppointmentsWeb.py:95
 #, fuzzy
 msgid "Participants"
 msgstr "artiklar"
 
-#: shared/web/AppointmentsWeb.py:95
+#: shared/web/AppointmentsWeb.py:97
 #, fuzzy
 msgid "Start"
 msgstr "Tillstånd"
@@ -2790,9 +2832,9 @@ msgstr "Editeringstid"
 msgid "Dominica"
 msgstr ""
 
-#: shared/web/VotesWeb.py:373
-msgid "Voter"
-msgstr "Väljare"
+#: shared/web/TranslationsWeb.py:125
+msgid "From "
+msgstr ""
 
 #: shared/common/VotesCommon.py:372 shared/web/ElectionsWeb.py:284
 #: shared/web/VotesWeb.py:914
@@ -2807,7 +2849,7 @@ msgstr ""
 msgid "(%d words)"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:238
+#: shared/web/AppointmentsWeb.py:240
 #, fuzzy
 msgid "Day long appointments"
 msgstr "Innehåll"
@@ -2829,10 +2871,9 @@ msgstr ""
 msgid "Minimum Year Value Difference to Now"
 msgstr ""
 
-#: shared/common/kinds.py:3805
-#, fuzzy
-msgid "Next Object"
-msgstr "Objekt"
+#: shared/web/geography.py:228
+msgid "Uganda"
+msgstr ""
 
 #: shared/common/RubricsCommon.py:114
 msgid "Headings"
@@ -2846,7 +2887,7 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#: shared/common/kinds.py:2573
+#: shared/common/kinds.py:2535
 #, fuzzy
 msgid "Item Type"
 msgstr "Mime-typ"
@@ -2876,7 +2917,7 @@ msgstr "Personer"
 msgid "Chad"
 msgstr "Skapa"
 
-#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:90
+#: shared/common/kinds.py:1337 shared/common/VirtualHostsCommon.py:150
 #, fuzzy
 msgid "Glasnost Dispatcher ID"
 msgstr "Ladda hem Glasnost"
@@ -2955,12 +2996,12 @@ msgstr "Skicka med e-post"
 msgid "Bolivia"
 msgstr ""
 
-#: shared/common/xhtmlgenerator.py:248 shared/common/widgets.py:154
+#: shared/common/xhtmlgenerator.py:251 shared/common/widgets.py:154
 #: shared/common/widgets.py:358 shared/web/widgets.py:506
 msgid "None"
 msgstr "Ingen"
 
-#: shared/common/kinds.py:2472
+#: shared/common/kinds.py:2434
 #, fuzzy
 msgid "Source Code"
 msgstr "Se källkod"
@@ -3003,7 +3044,7 @@ msgid ""
 "be displayed."
 msgstr ""
 
-#: shared/common/faults.py:541
+#: shared/common/faults.py:542
 msgid "Value too small!"
 msgstr "Värde för litet!"
 
@@ -3011,6 +3052,10 @@ msgstr "V
 msgid "Link Entry Field"
 msgstr ""
 
+#: profiles/cms.xml.in.h:1
+msgid "Content Management System"
+msgstr ""
+
 #: shared/web/geography.py:178
 msgid "Netherlands"
 msgstr ""
@@ -3029,13 +3074,8 @@ msgstr ""
 msgid "Evaluate"
 msgstr ""
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:516
-#, fuzzy
-msgid "An error occured while sending the password."
-msgstr "Översättare"
-
-#: shared/web/geography.py:194
-msgid "Romania"
+#: shared/web/geography.py:77
+msgid "Belarus"
 msgstr ""
 
 #: shared/web/geography.py:176
@@ -3057,7 +3097,7 @@ msgstr "Anv
 msgid "Benin"
 msgstr ""
 
-#: shared/common/kinds.py:2373
+#: shared/common/kinds.py:2335
 msgid "Python Identifier"
 msgstr ""
 
@@ -3127,11 +3167,11 @@ msgstr ""
 msgid "Multi-Line Field"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:247
+#: shared/common/VirtualHostsCommon.py:341
 msgid "Virtual Host"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:88
+#: shared/web/AppointmentsWeb.py:90
 #, fuzzy
 msgid "End"
 msgstr "Avslutad"
@@ -3163,11 +3203,6 @@ msgstr ""
 msgid "Kenya"
 msgstr "Aldrig"
 
-#: shared/common/kinds.py:1517
-#, fuzzy
-msgid "Function Name"
-msgstr "Förnamn"
-
 #: shared/web/geography.py:152
 msgid "Lesotho"
 msgstr ""
@@ -3180,7 +3215,7 @@ msgstr ""
 msgid "Best Average"
 msgstr "Bästa medelvärde"
 
-#: shared/common/kinds.py:3865
+#: shared/common/kinds.py:3827
 #, fuzzy
 msgid "Kind Name"
 msgstr "Förnamn"
@@ -3204,7 +3239,7 @@ msgid ""
 "items."
 msgstr ""
 
-#: shared/common/BrevesCommon.py:204 shared/web/tools.py:627
+#: shared/common/BrevesCommon.py:204 shared/web/tools.py:616
 #: shared/web/BrevesWeb.py:168 talTranslations.py:17
 msgid "Short News"
 msgstr "Kortnyheter"
@@ -3236,7 +3271,7 @@ msgstr ""
 msgid "The election \"%s\""
 msgstr "Omröstningen \"%s\""
 
-#: shared/web/AppointmentsWeb.py:225 shared/web/AppointmentsWeb.py:683
+#: shared/web/AppointmentsWeb.py:227 shared/web/AppointmentsWeb.py:686
 #, fuzzy
 msgid "Agenda"
 msgstr "Läsare"
@@ -3357,7 +3392,7 @@ msgstr ""
 msgid "Authentication (LDAP)"
 msgstr "Avstående"
 
-#: shared/common/VirtualHostsCommon.py:248
+#: shared/common/VirtualHostsCommon.py:342
 msgid "virtual hosts"
 msgstr ""
 
@@ -3365,7 +3400,7 @@ msgstr ""
 msgid "group"
 msgstr "grupp"
 
-#: shared/common/kinds.py:436 shared/common/kinds.py:3966
+#: shared/common/kinds.py:436 shared/common/kinds.py:3928
 #: shared/common/xhtmlgenerator.py:114 shared/common/modes.py:141
 #: shared/common/widgets.py:80 shared/common/widgets.py:84
 #, fuzzy
@@ -3381,7 +3416,7 @@ msgstr "Rangordning"
 msgid "New Forum"
 msgstr "Ny Atom"
 
-#: shared/web/AppointmentsWeb.py:57
+#: shared/web/AppointmentsWeb.py:59
 #, fuzzy
 msgid "Categories Group"
 msgstr "Vinnargrupp"
@@ -3445,7 +3480,7 @@ msgstr ""
 msgid "Author"
 msgstr "Skapare"
 
-#: shared/common/VirtualHostsCommon.py:246
+#: shared/common/VirtualHostsCommon.py:340
 msgid "virtual host"
 msgstr ""
 
@@ -3458,7 +3493,7 @@ msgstr "
 msgid "Sao Tome and Principe"
 msgstr ""
 
-#: shared/common/kinds.py:2826
+#: shared/common/kinds.py:2788
 msgid "Choose the author(s) for this object."
 msgstr ""
 
@@ -3470,12 +3505,17 @@ msgstr "Anv
 msgid "Public Ballots"
 msgstr "Öppna röstsedlar"
 
-#: shared/common/kinds.py:3946 shared/common/UploadFilesCommon.py:135
+#: shared/common/kinds.py:3908 shared/common/UploadFilesCommon.py:135
 #: shared/common/uploads.py:74 shared/web/UploadFilesWeb.py:77
 #: shared/web/uploads.py:67
 msgid "File"
 msgstr "Fil"
 
+#: shared/common/kinds.py:3812 shared/common/values.py:53
+#, fuzzy
+msgid "Kind"
+msgstr "Sök"
+
 #: shared/common/kinds.py:1267 shared/common/kinds.py:1269
 #, fuzzy
 msgid "Date & Time"
@@ -3489,7 +3529,7 @@ msgstr "Avslutad"
 msgid "Enter the name of this heading."
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:678 shared/web/widgets.py:598
+#: shared/web/AppointmentsWeb.py:681 shared/web/widgets.py:598
 #, fuzzy
 msgid "Year"
 msgstr "Läsare"
@@ -3500,7 +3540,7 @@ msgstr "Resultat"
 
 #: shared/common/xhtmlgenerator.py:90
 #: shared/web/AuthenticationLoginPasswordWeb.py:371
-#: shared/web/AuthenticationLoginPasswordWeb.py:576
+#: shared/web/AuthenticationLoginPasswordWeb.py:573
 msgid "New Account"
 msgstr "Nytt användarkonto"
 
@@ -3557,7 +3597,7 @@ msgstr ""
 msgid "Alias"
 msgstr ""
 
-#: shared/common/kinds.py:3276
+#: shared/common/kinds.py:3238
 #, fuzzy
 msgid "Access in Creation Mode"
 msgstr "Datum vid skapande"
@@ -3586,7 +3626,7 @@ msgstr "Misslyckades"
 msgid "Eritrea"
 msgstr "Redigerare"
 
-#: shared/common/kinds.py:2462
+#: shared/common/kinds.py:2424
 msgid "Execute On Display"
 msgstr ""
 
@@ -3650,7 +3690,7 @@ msgstr ""
 msgid "Format"
 msgstr "Format"
 
-#: shared/web/AuthenticationLoginPasswordWeb.py:611
+#: shared/web/AuthenticationLoginPasswordWeb.py:608
 msgid ""
 "The account has successfully been created, but a SMTP error has occurred.\n"
 "Maybe the Mail Transport Agent on the Glasnost server is badly configured."
@@ -3679,7 +3719,7 @@ msgstr "Ny Person"
 msgid "Suriname"
 msgstr "Smeknamn"
 
-#: shared/common/VirtualHostsCommon.py:58
+#: shared/common/VirtualHostsCommon.py:60
 #, fuzzy
 msgid "Default Virtual Host"
 msgstr "Röst - %s"
@@ -3697,7 +3737,7 @@ msgstr "Typ av r
 msgid "State"
 msgstr "Tillstånd"
 
-#: shared/common/kinds.py:2727
+#: shared/common/kinds.py:2689
 #, fuzzy
 msgid "Select accepted types of items."
 msgstr "Välj en kandidat att lägga till"
@@ -3710,7 +3750,7 @@ msgstr ""
 msgid "Administrators"
 msgstr "Administratörer"
 
-#: shared/common/faults.py:240
+#: shared/common/faults.py:241
 msgid "Specified file path does not exist!"
 msgstr "Den angivna sökvägen finns inte!"
 
@@ -3755,7 +3795,7 @@ msgstr ""
 "%s\n"
 
 #: shared/common/kinds.py:980 shared/common/kinds.py:1487
-#: shared/common/kinds.py:1685
+#: shared/common/kinds.py:1647
 #, fuzzy
 msgid "Numbers"
 msgstr "Icke-medlem"
@@ -3792,8 +3832,8 @@ msgstr ""
 
 #: shared/common/ArticlesCommon.py:64 shared/common/kinds.py:378
 #: shared/common/kinds.py:1372 shared/common/kinds.py:1454
-#: shared/common/kinds.py:2353 shared/common/kinds.py:3206
-#: shared/common/kinds.py:3208 shared/web/AppointmentsWeb.py:64
+#: shared/common/kinds.py:2315 shared/common/kinds.py:3168
+#: shared/common/kinds.py:3170 shared/web/AppointmentsWeb.py:66
 #: shared/web/BrevesWeb.py:63 shared/web/CommentsWeb.py:62
 #: shared/web/ArticlesWeb.py:78
 msgid "Text"
@@ -3808,7 +3848,7 @@ msgstr "Tyska"
 msgid "hour"
 msgstr "Skapare"
 
-#: shared/common/faults.py:133
+#: shared/common/faults.py:134
 #, fuzzy
 msgid "Unknown error"
 msgstr "Okänd"
@@ -3831,7 +3871,7 @@ msgstr ""
 msgid "Text Format"
 msgstr "Format"
 
-#: shared/common/kinds.py:1674
+#: shared/common/kinds.py:1636
 #, fuzzy
 msgid "Maximum Value"
 msgstr "Standardgrupp"
@@ -3895,8 +3935,8 @@ msgstr ""
 msgid "Denmark"
 msgstr ""
 
-#: shared/common/kinds.py:3279 shared/common/kinds.py:3298
-#: shared/common/kinds.py:3316
+#: shared/common/kinds.py:3241 shared/common/kinds.py:3260
+#: shared/common/kinds.py:3278
 #, fuzzy
 msgid "Embedded"
 msgstr "Avslutad"
@@ -3928,7 +3968,7 @@ msgstr "SPIP"
 msgid "\"%s\" ImplementationsreadLanguages"
 msgstr ""
 
-#: shared/common/kinds.py:2923
+#: shared/common/kinds.py:2885
 msgid "Select the people and groups who are allowed to read the item."
 msgstr ""
 
@@ -3968,10 +4008,15 @@ msgstr "Se skillnader"
 msgid "short article"
 msgstr "Kortnyhet"
 
-#: shared/common/kinds.py:2563
+#: shared/common/kinds.py:2525
 msgid "Minimum Number of Items to Edit"
 msgstr ""
 
+#: profiles/vote.xml.in.h:1
+#, fuzzy
+msgid "Electronic Voting"
+msgstr "Omröstningens varaktighet"
+
 #: shared/common/kinds.py:1488
 msgid "Float Number"
 msgstr ""
@@ -4024,8 +4069,8 @@ msgstr "Logga ut"
 msgid "Re-enter your new password."
 msgstr ""
 
-#: shared/common/kinds.py:1783 shared/common/kinds.py:3280
-#: shared/common/kinds.py:3299 shared/common/kinds.py:3317
+#: shared/common/kinds.py:1745 shared/common/kinds.py:3242
+#: shared/common/kinds.py:3261 shared/common/kinds.py:3279
 msgid "Link"
 msgstr "Länk"
 
@@ -4049,7 +4094,7 @@ msgstr ""
 msgid "CRANS"
 msgstr ""
 
-#: shared/common/kinds.py:2930 shared/common/kinds.py:2932
+#: shared/common/kinds.py:2892 shared/common/kinds.py:2894
 msgid "Readers"
 msgstr "Läsare"
 
@@ -4100,7 +4145,7 @@ msgstr ""
 msgid "Enter your email address."
 msgstr ""
 
-#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1310
+#: shared/proxy/ObjectsProxy.py:1247 shared/proxy/ObjectsProxy.py:1309
 msgid " (at <%s>)"
 msgstr ""
 
@@ -4129,7 +4174,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
-#: shared/common/faults.py:256
+#: shared/common/faults.py:257
 msgid "Access to file is denied!"
 msgstr "Filåtkomst ej tillåten!"
 
@@ -4137,7 +4182,7 @@ msgstr "Fil
 msgid "Singapore"
 msgstr ""
 
-#: shared/common/VirtualHostsCommon.py:101
+#: shared/common/VirtualHostsCommon.py:161
 #, fuzzy
 msgid "Web Host Name"
 msgstr "Efternamn"
@@ -4185,7 +4230,7 @@ msgstr ""
 "<p>Kandidaterna <i>%(candidates)s</i> har de bästa medelvärdena.</"
 "p><p>Kandidaterna %(candidates)s vinner valet.</p>"
 
-#: shared/common/kinds.py:3573 shared/web/GroupsWeb.py:114
+#: shared/common/kinds.py:3535 shared/web/GroupsWeb.py:114
 msgid "Items"
 msgstr "Poster"
 
@@ -4207,7 +4252,7 @@ msgstr ""
 "<p>Kandidaten \"<i>%(candidate)s</i>\" har det högsta medelvärdet.</"
 "p><p>Kandidaten \"<i>%(candidate)s</i>\" vinner valet.</p>"
 
-#: shared/web/AppointmentsWeb.py:75
+#: shared/web/AppointmentsWeb.py:77
 #, fuzzy
 msgid "Categories"
 msgstr "Kapitel"
@@ -4217,7 +4262,7 @@ msgid "True"
 msgstr ""
 
 #: shared/common/TranslationsCommon.py:138 shared/web/TranslationsWeb.py:174
-#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:900
+#: shared/web/TranslationsWeb.py:215 shared/web/ObjectsWeb.py:908
 #, fuzzy
 msgid "Translation"
 msgstr "Översättare"
@@ -4226,16 +4271,16 @@ msgstr "
 msgid "Entrouvert.com"
 msgstr ""
 
-#: shared/common/kinds.py:3090
+#: shared/common/kinds.py:3052
 #, fuzzy
 msgid "Glasnost Server ID"
 msgstr "Ladda hem Glasnost"
 
-#: shared/common/kinds.py:3664 shared/common/kinds.py:3668
+#: shared/common/kinds.py:3626 shared/common/kinds.py:3630
 msgid "Modification Time"
 msgstr "Modifieringsdatum"
 
-#: shared/web/AppointmentsWeb.py:222
+#: shared/web/AppointmentsWeb.py:224
 #, fuzzy
 msgid "Past events"
 msgstr "Mottagare"
@@ -4244,7 +4289,7 @@ msgstr "Mottagare"
 msgid "HTML"
 msgstr ""
 
-#: shared/common/kinds.py:3296
+#: shared/common/kinds.py:3258
 #, fuzzy
 msgid "Access in Edition Mode"
 msgstr "Editeringstid"
@@ -4277,7 +4322,12 @@ msgstr "GnuPG fingeravtryck"
 msgid "preferences"
 msgstr "inställningar"
 
-#: shared/web/widgets.py:1871
+#: shared/common/xhtmlgenerator.py:92
+#, fuzzy
+msgid "Pester Absentionnists"
+msgstr "Avstående:"
+
+#: shared/web/widgets.py:1890
 #, fuzzy
 msgid "other:"
 msgstr "Väljare :"
@@ -4286,15 +4336,15 @@ msgstr "V
 msgid "vote"
 msgstr "röst"
 
-#: shared/web/ElectionsWeb.py:70
-msgid "Kind of Ballots"
-msgstr "Röstsedlarnas typ"
+#: shared/web/geography.py:179
+msgid "Norway"
+msgstr ""
 
 #: shared/web/TranslationsWeb.py:252
 msgid "Translators"
 msgstr "Översättare"
 
-#: shared/web/widgets.py:1739
+#: shared/web/widgets.py:1755
 msgid "download"
 msgstr ""
 
@@ -4315,8 +4365,8 @@ msgstr ""
 msgid "Single-Line Text Entry Field"
 msgstr ""
 
-#: shared/web/AppointmentsWeb.py:205 shared/web/AppointmentsWeb.py:217
-#: shared/web/widgets.py:1872
+#: shared/web/AppointmentsWeb.py:207 shared/web/AppointmentsWeb.py:219
+#: shared/web/widgets.py:1891
 msgid "Label"
 msgstr ""
 
@@ -4362,10 +4412,10 @@ msgstr "V
 msgid "Select the front article of this heading."
 msgstr ""
 
-#: shared/web/ObjectsWeb.py:1194
+#: shared/common/kinds.py:3767
 #, fuzzy
-msgid "No comment."
-msgstr "kommentar"
+msgid "Next Object"
+msgstr "Objekt"
 
 #: shared/common/modes.py:219
 #, fuzzy
@@ -4390,7 +4440,7 @@ msgstr ""
 msgid "Edition Aspect"
 msgstr "Editeringstid"
 
-#: shared/common/kinds.py:2366
+#: shared/common/kinds.py:2328
 msgid "Invalid values"
 msgstr ""
 
@@ -4399,7 +4449,7 @@ msgstr ""
 msgid "minute"
 msgstr "Icke-medlem"
 
-#: shared/web/AppointmentsWeb.py:675
+#: shared/web/AppointmentsWeb.py:678
 msgid "Week"
 msgstr ""
 
@@ -4468,7 +4518,7 @@ msgstr "Inneh
 msgid "Choose the candidates for this election."
 msgstr "De avslutade omröstningarnas röster"
 
-#: shared/web/AppointmentsWeb.py:673 shared/web/widgets.py:628
+#: shared/web/AppointmentsWeb.py:676 shared/web/widgets.py:628
 msgid "Day"
 msgstr ""
 
@@ -4499,7 +4549,7 @@ msgstr "Kandidate"
 msgid "Creation Aspect"
 msgstr "Datum vid skapande"
 
-#: shared/common/kinds.py:1559 shared/common/ObjectsCommon.py:215
+#: shared/common/kinds.py:1521 shared/common/ObjectsCommon.py:215
 msgid "Object"
 msgstr "Objekt"
 
@@ -4576,10 +4626,10 @@ msgstr ""
 msgid "Election in progress"
 msgstr "Aktiv omröstning"
 
-#: shared/common/kinds.py:3850 shared/common/values.py:53
+#: shared/web/CommentsWeb.py:156
 #, fuzzy
-msgid "Kind"
-msgstr "Sök"
+msgid "Editorial Comments"
+msgstr "Kommentar"
 
 #: shared/common/widgets.py:274
 #, fuzzy
@@ -4599,20 +4649,20 @@ msgstr ""
 msgid "Somalia"
 msgstr "Misslyckades"
 
-#: shared/web/tools.py:633
+#: shared/web/tools.py:622
 #, fuzzy
 msgid "Unknown"
 msgstr "Okänd"
 
-#: shared/common/VirtualHostsCommon.py:149 shared/web/AppointmentsWeb.py:97
+#: shared/common/VirtualHostsCommon.py:243 shared/web/AppointmentsWeb.py:99
 #: shared/web/ElectionsWeb.py:128 shared/web/BrevesWeb.py:73
-#: shared/web/CommentsWeb.py:69 shared/web/ForumsWeb.py:71
-#: shared/web/UploadFilesWeb.py:107 shared/web/widgets.py:932
-#: shared/web/ArticlesWeb.py:87 shared/web/SystemFilesWeb.py:82
+#: shared/web/ForumsWeb.py:71 shared/web/UploadFilesWeb.py:107
+#: shared/web/widgets.py:932 shared/web/ArticlesWeb.py:87
+#: shared/web/SystemFilesWeb.py:82
 msgid "Title"
 msgstr "Titel"
 
-#: shared/common/kinds.py:2838 shared/common/kinds.py:2840
+#: shared/common/kinds.py:2800 shared/common/kinds.py:2802
 msgid "Authors"
 msgstr "Författare"
 
@@ -4634,6 +4684,14 @@ msgstr ""
 msgid "Canada"
 msgstr "Kandidate"
 
+#, fuzzy
+#~ msgid "Enter the title of your comment."
+#~ msgstr "De senaste artiklarna"
+
+#, fuzzy
+#~ msgid "Function Name"
+#~ msgstr "Förnamn"
+
 #~ msgid "Can't change value!"
 #~ msgstr "Omöjligt att ändra värde!"
 
@@ -5049,10 +5107,6 @@ msgstr "Kandidate"
 #~ msgid "New Organization"
 #~ msgstr "Översättare"
 
-#, fuzzy
-#~ msgid "Function Calls"
-#~ msgstr "Ringt telefonsamtal"
-
 #~ msgid "The sending of the password by email to %s has failed!"
 #~ msgstr "Skickandet av lösenordet med e-post till %s misslyckades!"
 
diff --git a/profiles/.cvsignore b/profiles/.cvsignore
new file mode 100644
index 00000000..c136c5b6
--- /dev/null
+++ b/profiles/.cvsignore
@@ -0,0 +1,2 @@
+*.xml
+*.xml.in.h
diff --git a/profiles/basic.xml.in b/profiles/basic.xml.in
new file mode 100644
index 00000000..659d3780
--- /dev/null
+++ b/profiles/basic.xml.in
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<glasnost>
+	<_description>Basic Functionalities</_description>
+	<roles>
+		<role>authentication</role>
+		<role>authentication-login-password</role>
+		<role>groups</role>
+		<role>pagenames</role>
+		<role>people</role>
+		<role>preferences</role>
+		<role>sessions</role>
+		<role>virtualhosts</role>
+	</roles>
+</glasnost>
+
diff --git a/profiles/cards.xml.in b/profiles/cards.xml.in
new file mode 100644
index 00000000..b56d67b1
--- /dev/null
+++ b/profiles/cards.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<glasnost>
+	<_description>Cards Support</_description>
+	<roles>
+		<role>cards</role>
+	</roles>
+</glasnost>
+
diff --git a/profiles/cms.xml.in b/profiles/cms.xml.in
new file mode 100644
index 00000000..25a3aefd
--- /dev/null
+++ b/profiles/cms.xml.in
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<glasnost>
+	<_description>Content Management System</_description>
+	<roles>
+		<role>articles</role>
+		<role>rubrics</role>
+		<role>uploadfiles</role>
+	</roles>
+</glasnost>
+
diff --git a/profiles/comments.xml.in b/profiles/comments.xml.in
new file mode 100644
index 00000000..e208315d
--- /dev/null
+++ b/profiles/comments.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<glasnost>
+	<_description>Comments Support</_description>
+	<roles>
+		<role>comments</role>
+	</roles>
+</glasnost>
+
diff --git a/profiles/ldap.xml.in b/profiles/ldap.xml.in
new file mode 100644
index 00000000..ab798f34
--- /dev/null
+++ b/profiles/ldap.xml.in
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<glasnost>
+	<_description>LDAP Support</_description>
+	<roles>
+		<role>authentication-ldap</role>
+		<role>ldappeople</role>
+	</roles>
+</glasnost>
+
diff --git a/profiles/translations.xml.in b/profiles/translations.xml.in
new file mode 100644
index 00000000..ad4ca075
--- /dev/null
+++ b/profiles/translations.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<glasnost>
+	<_description>Translations Support</_description>
+	<roles>
+		<role>translations</role>
+	</roles>
+</glasnost>
+
diff --git a/profiles/vote.xml.in b/profiles/vote.xml.in
new file mode 100644
index 00000000..32947a94
--- /dev/null
+++ b/profiles/vote.xml.in
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<glasnost>
+	<_description>Electronic Voting</_description>
+	<roles>
+		<role>atoms</role>
+		<role>ballots</role>
+		<role>elections</role>
+		<role>grades</role>
+		<role>votes</role>
+	</roles>
+</glasnost>
+
diff --git a/scripts/editArticle.py b/scripts/editArticle.py
index 3e6531e6..4b842dd6 100755
--- a/scripts/editArticle.py
+++ b/scripts/editArticle.py
@@ -5,7 +5,7 @@ from scriptingTools import *
 from glasnost.proxy.tools import getProxyForServerRole
 
 articleId = sys.argv[1]
-dispatcherId = 'glasnost://' + splitObjectId(articleId)[0]
+dispatcherId = commonTools.extractDispatcherId(articleId)
 
 init(dispatcherId)
 
diff --git a/scripts/setInitialSettings.py b/scripts/setInitialSettings.py
index fb2d28bd..56ba389c 100755
--- a/scripts/setInitialSettings.py
+++ b/scripts/setInitialSettings.py
@@ -7,7 +7,7 @@ from glasnost.proxy.tools import getProxyForServerRole
 adminId = sys.argv[1]
 editorsId = sys.argv[2]
 
-dispatcherId = 'glasnost://' + splitObjectId(adminId)[0]
+dispatcherId = commonTools.extractDispatcherId(adminId)
 
 init(dispatcherId)
 
diff --git a/servers/AppointmentsServer/AppointmentsServer.py b/servers/AppointmentsServer/AppointmentsServer.py
index b87d7eb2..81593b32 100755
--- a/servers/AppointmentsServer/AppointmentsServer.py
+++ b/servers/AppointmentsServer/AppointmentsServer.py
@@ -55,7 +55,7 @@ import glasnost
 
 from glasnost.common.AppointmentsCommon import *
 import glasnost.common.faults as faults
-from glasnost.common.tools import sendMail, splitObjectId
+from glasnost.common.tools import sendMail
 import glasnost.common.tools_new as commonTools
 
 from glasnost.server.ObjectsServer import ObjectServerMixin, \
@@ -174,63 +174,12 @@ class AppointmentsServer(AppointmentsCommonMixin, ObjectsServer):
 
     def addObjectXmlRpc(self, objectImport):
         objectId = ObjectsServer.addObjectXmlRpc(self, objectImport)
-        return objectId
-
-        # TODO: proper notification email
-        virtualServerId = context.getVar('applicationId')
-        virtualServer = self.getVirtualServer(virtualServerId)
-        object = virtualServer.loadObjectCore(objectId)
-
-        ## send notification mail.
-        subject = _('New appointment')
-        body = _("""
-A new appointement has been set for you on:
-%(hostName)s/%(id)s
-
-Subject: %(title)s
-Message: %(body)s
-Beginning: %(start)s
-
-""") % {
-                'hostName': getProxyForServerRole('virtualhosts').getHostName(
-                        virtualServerId),
-                'id' : '/'.join(splitObjectId(objectId)[1:]),
-                'title': object.title,
-                'body': object.body,
-                'start': time.strftime('%Y-%m-%d %H:%M:%S',
-                                       time.localtime(object.start))
-                }
-        self.sendNotification(virtualServerId, object, subject, body)
-
+        # TODO: send notification mail
         return objectId
     
     def modifyObjectXmlRpc(self, objectImport):
         version = ObjectsServer.modifyObjectXmlRpc(self, objectImport)
-        virtualServerId = context.getVar('applicationId')
-        virtualServer = self.getVirtualServer(virtualServerId)
-        object = virtualServer.loadObjectCore(objectImport['id'])
-
-        ## send notification mail.
-        subject = _('Appointment modified')
-        body = _("""
-An appointment has been modified for you on:
-%(hostName)s/%(id)s
-
-Subject: %(title)s
-Message: %(body)s
-Beginning: %(start)s
-
-""") % {
-                'hostName': getProxyForServerRole('virtualhosts').getHostName(
-                        virtualServerId),
-                'id' : '/'.join(splitObjectId(object.id)[1:]),
-                'title': object.title,
-                'body': object.body,
-                'start': time.strftime('%Y-%m-%d %H:%M:%S',
-                                       time.localtime(object.start))
-                }
-        self.sendNotification(virtualServerId, object, subject, body) 
-
+        # TODO: send notification mail
         return version
 
     def updateFromVCalendar(self, vCalendar):
diff --git a/servers/ArticlesServer/ArticlesServer.py b/servers/ArticlesServer/ArticlesServer.py
index c6052975..b55e9dd4 100755
--- a/servers/ArticlesServer/ArticlesServer.py
+++ b/servers/ArticlesServer/ArticlesServer.py
@@ -96,7 +96,8 @@ class Article(ObjectServerMixin, ArticleCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         articlesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         bodyFilePath = os.path.join(articlesDirectoryPath, localId)
         if not os.access(bodyFilePath, os.F_OK):
             return None
@@ -142,7 +143,8 @@ class Article(ObjectServerMixin, ArticleCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         articlesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         bodyHistoryDirectoryPath = os.path.join(
             articlesDirectoryPath, localId + '-history')
         history = []
@@ -174,7 +176,8 @@ class Article(ObjectServerMixin, ArticleCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         articlesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         bodyHistoryDirectoryPath = os.path.join(
             articlesDirectoryPath, localId + '-history')
         if not os.access(bodyHistoryDirectoryPath, os.F_OK):
@@ -227,7 +230,8 @@ class Article(ObjectServerMixin, ArticleCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         articlesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         bodyFilePath = os.path.join(articlesDirectoryPath, localId)
         try:
             bodyFile = open(bodyFilePath, 'rb')
@@ -266,7 +270,8 @@ class Article(ObjectServerMixin, ArticleCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         articlesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         bodyFilePath = os.path.join(articlesDirectoryPath, localId)
         try:
             os.remove(bodyFilePath)
@@ -280,7 +285,8 @@ class Article(ObjectServerMixin, ArticleCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         articlesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         bodyHistoryDirectoryPath = os.path.join(
             articlesDirectoryPath, localId + '-history')
         if not os.access(bodyHistoryDirectoryPath, os.F_OK):
@@ -314,7 +320,8 @@ class Article(ObjectServerMixin, ArticleCommon):
         if not os.access(articlesDirectoryPath, os.F_OK):
             os.mkdir(articlesDirectoryPath)
             os.chmod(articlesDirectoryPath, 0750)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         bodyFilePath = os.path.join(articlesDirectoryPath, localId)
         bodyFile = open(bodyFilePath, 'wb')
         os.chmod(bodyFilePath, 0640)
@@ -328,7 +335,8 @@ class Article(ObjectServerMixin, ArticleCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         articlesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         bodyHistoryDirectoryPath = os.path.join(
             articlesDirectoryPath, localId + '-history')
         if not os.access(bodyHistoryDirectoryPath, os.F_OK):
@@ -432,7 +440,7 @@ class ArticlesServer(ArticlesCommonMixin, ObjectsServer):
             destinationVirtualServerDataDirectoryPath, self.applicationRole)
         for id in virtualServer.objects.keys():
             serverHostNameAndPortNotUsed, serverRoleNotUsed, localId = \
-                                          splitObjectId(id)
+                    commonTools.splitId(id)
             sourceBodyFilePath = os.path.join(
                 sourceObjectsDirectoryPath, localId)
             destinationBodyFilePath = os.path.join(
@@ -505,7 +513,7 @@ class ArticlesServer(ArticlesCommonMixin, ObjectsServer):
             exportDirectoryPath, self.applicationRole)
         for id in virtualServer.objects.keys():
             serverHostNameAndPortNotUsed, serverRoleNotUsed, localId = \
-                                          splitObjectId(id)
+                    commonTools.splitId(id)
             sourceBodyFilePath = os.path.join(
                 objectsDirectoryPath, localId)
             exportBodyFilePath = os.path.join(
@@ -665,7 +673,7 @@ class ArticlesServer(ArticlesCommonMixin, ObjectsServer):
             virtualServerDataDirectoryPath, self.applicationRole)
         for id in virtualServer.objects.keys():
             serverHostNameAndPortNotUsed, serverRoleNotUsed, localId = \
-                                          splitObjectId(id)
+                    commonTools.splitId(id)
             importBodyFilePath = os.path.join(
                 importObjectsDirectoryPath, localId)
             destinationBodyFilePath = os.path.join(
@@ -771,7 +779,7 @@ class ArticlesServer(ArticlesCommonMixin, ObjectsServer):
             virtualServerDataDirectoryPath, self.applicationRole)
         for id in virtualServer.objects.keys():
             serverHostNameAndPortNotUsed, serverRoleNotUsed, localId = \
-                                          splitObjectId(id)
+                    commonTools.splitId(id)
             bodyHistoryDirectoryPath = os.path.join(
                 objectsDirectoryPath, localId + '-history')
             if not os.access(bodyHistoryDirectoryPath, os.F_OK):
@@ -827,7 +835,8 @@ class ArticlesServer(ArticlesCommonMixin, ObjectsServer):
             objectsDirectoryPath = os.path.join(
                 virtualServerDataDirectoryPath, self.applicationRole)
             for id in virtualServer.objects.keys():
-                serverHostNameAndPort, serverRole, localId = splitObjectId(id)
+                serverHostNameAndPort, serverRole, localId = \
+                        commonTools.splitId(id)
                 bodyFilePath = os.path.join(objectsDirectoryPath, localId)
                 if not os.access(bodyFilePath, os.F_OK):
                     continue
@@ -866,7 +875,8 @@ class ArticlesServer(ArticlesCommonMixin, ObjectsServer):
                 virtualServerDataDirectoryPath, self.applicationRole)
             for id, object in virtualServer.objects.items():
                 changed = object.repair(5004) or changed
-                serverHostNameAndPort, serverRole, localId = splitObjectId(id)
+                serverHostNameAndPort, serverRole, localId = \
+                        commonTools.splitId(id)
                 bodyFilePath = os.path.join(objectsDirectoryPath, localId)
                 if not os.access(bodyFilePath, os.F_OK):
                     continue
diff --git a/servers/AtomsServer/AtomsServer.py b/servers/AtomsServer/AtomsServer.py
index d6cf4b14..f410bc9b 100755
--- a/servers/AtomsServer/AtomsServer.py
+++ b/servers/AtomsServer/AtomsServer.py
@@ -56,6 +56,7 @@ import glasnost
 from glasnost.common.AtomsCommon import *
 import glasnost.common.faults as faults
 import glasnost.common.context as context
+import glasnost.common.tools_new as commonTools
 import glasnost.common.xhtmlgenerator as X
 
 from glasnost.server.ObjectsServer import register, ObjectServerMixin, \
@@ -77,7 +78,7 @@ class Atom(ObjectServerMixin, AtomCommon):
     def canBeCreatedByClient(self):
         clientToken = context.getVar('clientToken')
         clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
+        clientNameAndPort, clientRole, mu = commonTools.splitId(clientId)
         return ObjectServerMixin.canBeCreatedByClient(self) \
                or clientRole == 'elections'
 
diff --git a/servers/CommentsServer/CommentsServer.py b/servers/CommentsServer/CommentsServer.py
index 33982eea..fc5dbef7 100755
--- a/servers/CommentsServer/CommentsServer.py
+++ b/servers/CommentsServer/CommentsServer.py
@@ -110,12 +110,20 @@ class CommentsServer(CommentsCommonMixin, ObjectsServer):
     def canGetObjects(self):
         return 0
 
-    def getObjectIdsWithParent(self, parentId):
+    def canPostEditorialComment(self, parentId):
+        roleProxy = getProxyForServerRole(
+                commonTools.extractRole(parentId))
+        return roleProxy.canModifyObject(parentId)
+
+    def getObjectIdsWithParent(self, parentId, isEditorial):
+        if isEditorial and not self.canPostEditorialComment(parentId):
+            raise faults.UserAccessDenied()
         virtualServerId = context.getVar('applicationId')
         virtualServer = self.getVirtualServer(virtualServerId)
         tempResult = []
         for objectId, objectCore in virtualServer.objects.items():
-            if self.getParentId(objectCore) == parentId:
+            if self.getParentId(objectCore) == parentId and \
+                    objectCore.isEditorial == isEditorial:
                 tempResult.append(objectId)
         result = []
         for objectId in tempResult:
@@ -133,6 +141,7 @@ class CommentsServer(CommentsCommonMixin, ObjectsServer):
 
     def registerPublicMethods(self):
         ObjectsServer.registerPublicMethods(self)
+        self.registerPublicMethod('canPostEditorialComment')
         self.registerPublicMethod('getObjectIdsWithParent')
 
 commentsServer = CommentsServer()
diff --git a/servers/Dispatcher/Dispatcher.py b/servers/Dispatcher/Dispatcher.py
index a0c7bd8b..a37e7d76 100755
--- a/servers/Dispatcher/Dispatcher.py
+++ b/servers/Dispatcher/Dispatcher.py
@@ -46,6 +46,8 @@ __doc__ = """Glasnost Dispatcher"""
 __version__ = '$Revision$'[11:-2]
 
 
+import os
+import sgmllib
 import sys
 import whrandom
 
@@ -67,6 +69,29 @@ applicationName = 'Dispatcher'
 applicationRole = None
 
 
+class ProfileRolesParser(sgmllib.SGMLParser):
+    inRole = 0
+    roleName = None
+    roles = None
+    def __init__(self, body):
+        sgmllib.SGMLParser.__init__(self)
+        self.roles = []
+        self.feed(body)
+
+    def start_role(self, attrs):
+        self.inRole = 1
+        self.roleName = ''
+
+    def end_role(self):
+        self.inRole = 0
+        self.roles.append(self.roleName)
+        self.roleName = None
+
+    def handle_data(self, data):
+        if self.inRole:
+            self.roleName += data
+
+
 class DispatcherVirtualServer(VirtualServer):
     """Partial class designed for aggregation.
     
@@ -79,7 +104,7 @@ class DispatcherVirtualServer(VirtualServer):
     *applicationTokens*:
         The dictionnary containing all the Glasnost application token. The
         key is the client token.
-
+    
     *serverAccessors*:
         The servers access informations dictionnary, sorted by applicationId.
         It consists of:
@@ -110,6 +135,7 @@ class DispatcherVirtualServer(VirtualServer):
     defaultAccessors = None
     serverInfos = None
     virtualServerIds = None
+    virtualServerIdProfiles = None
 
     def init(self):
         VirtualServer.init(self)
@@ -119,6 +145,9 @@ class DispatcherVirtualServer(VirtualServer):
         self.serverAccessors = {}
         self.serverInfos = {}
         self.virtualServerIds = {}
+        self.virtualServerIdProfiles = {
+                'glasnost://system': ['basic', 'cms', 'translations'],
+            }
 
 
 class Dispatcher(Server):
@@ -126,6 +155,7 @@ class Dispatcher(Server):
     hasMultipleVirtualServers = 0
     randomGenerator = None
     useDataFile = 0
+    rolesByProfile = None
 
     def getApplicationId(self, applicationToken):
         """Get the application ID from the application token.
@@ -225,6 +255,17 @@ class Dispatcher(Server):
 
     def init(self):
         self.randomGenerator = whrandom.whrandom()
+
+        self.rolesByProfile = {}
+        profilesPath = os.path.join(commonTools.configDir, 'profiles')
+        profiles = os.listdir(profilesPath)
+        values = [x[:-4] for x in profiles if x.endswith('.xml')]
+        for p in values:
+            pFileName = os.path.join(profilesPath, p + '.xml')
+            self.rolesByProfile[p] = ProfileRolesParser(
+                    open(pFileName).read()).roles
+        print 'self.rolesByProfile:', self.rolesByProfile
+
         Server.init(self)
 
     def loadConfigOptions(self):
@@ -238,7 +279,7 @@ class Dispatcher(Server):
         autorizedHostNames = autorizedHostNames.strip().split()
         configContext.setVar('autorizedHostNames', autorizedHostNames)
 
-    def registerDispatcherId(self, dispatcherId):
+    def registerDispatcherId(self, dispatcherId, profiles):
         """Register a new dispatcherId to the dispatcher."""
         
         virtualServer = self.getVirtualServer(None)
@@ -255,6 +296,7 @@ class Dispatcher(Server):
         clientId = virtualServer.virtualServerIds[clientToken]
 
         virtualServer.dispatcherIds.append(dispatcherId)
+        virtualServer.virtualServerIdProfiles[dispatcherId] = profiles
         print 'Registered dispatcher id "%s"' % dispatcherId
 
         if virtualServer.serverAccessors.has_key(clientId):
@@ -273,16 +315,26 @@ class Dispatcher(Server):
             serverId = commonTools.makeApplicationId(
                     'glasnost://%s' % serverAccessor['serverHostName'],
                     serverInfo['role'])
-            print 'Calling addDispatcher(%s) for %s' % (dispatcherId, serverId)
-            context.push(_level = 'registerDispatcherId',
-                         directServerAccessor = serverAccessor)
-            try:
-                callServer(serverId, 'addDispatcher', [
-                        serverId, getApplicationToken(),
-                        context.getVar('userToken'), dispatcherId])
-            finally:
-                context.pull(_level = 'registerDispatcherId')
-            print 'Called addDispatcher(%s) for %s' % (dispatcherId, serverId)
+
+            rolesForVirtualServer = [''] # '' is for dispatcher
+            for p in virtualServer.virtualServerIdProfiles[dispatcherId]:
+                rolesForVirtualServer += self.rolesByProfile[p]
+
+            if serverInfo['role'] in rolesForVirtualServer:
+                print 'Calling addDispatcher(%s) for %s' % (
+                        dispatcherId, serverId)
+                context.push(_level = 'registerDispatcherId',
+                             directServerAccessor = serverAccessor)
+                try:
+                    callServer(serverId, 'addDispatcher', [
+                            serverId, getApplicationToken(),
+                            context.getVar('userToken'), dispatcherId])
+                finally:
+                    context.pull(_level = 'registerDispatcherId')
+                print 'Called addDispatcher(%s) for %s' % (dispatcherId, serverId)
+            else:
+                print 'Not calling addDispatcher(%s) for %s' % (
+                        dispatcherId, serverId)
 
     def registerToDispatcher(self):
         applicationId = context.getVar('applicationId')
@@ -357,6 +409,15 @@ class Dispatcher(Server):
         if not virtualServer.serverInfos.has_key(serverNameAndPort):
             raise faults.UnregisteredServer(serverHostName, serverPort)
 
+        rolesForVirtualServer = [''] # '' is for dispatcher
+        for p in virtualServer.virtualServerIdProfiles[serverDispatcherId]:
+            rolesForVirtualServer += self.rolesByProfile[p]
+        print 'rolesForVirtualServer:', rolesForVirtualServer
+        serverRole = commonTools.extractRole(serverId)
+        if not serverRole in rolesForVirtualServer:
+            print serverRole, 'not in roles defined by profiles for', serverDispatcherId
+            raise faults.RoleNotInProfiles(serverRole)
+
         virtualServer.serverAccessors[serverId] = virtualServer.serverInfos[
                 serverNameAndPort]['accessor']
         print 'Registered virtual server %s (for %s:%s)' % (
diff --git a/servers/GradesServer/GradesServer.py b/servers/GradesServer/GradesServer.py
index 86c73751..d0762322 100755
--- a/servers/GradesServer/GradesServer.py
+++ b/servers/GradesServer/GradesServer.py
@@ -55,6 +55,7 @@ import glasnost
 
 from glasnost.common.GradesCommon import *
 import glasnost.common.faults as faults
+import glasnost.common.tools_new as commonTools
 import glasnost.common.xhtmlgenerator as X
 
 from glasnost.server.ObjectsServer import register, ObjectServerMixin, \
@@ -76,7 +77,7 @@ class Grade(ObjectServerMixin, GradeCommon):
     def canBeModifiedByClient(self):
         clientToken = context.getVar('clientToken')
         clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
+        clientNameAndPort, clientRole, mu = commonTools.splitId(clientId)
         return ObjectServerMixin.canBeModifiedByClient(self) \
                or clientRole == 'elections'
 register(Grade)
diff --git a/servers/GroupsServer/GroupsServer.py b/servers/GroupsServer/GroupsServer.py
index b50b97a5..4a4cd877 100755
--- a/servers/GroupsServer/GroupsServer.py
+++ b/servers/GroupsServer/GroupsServer.py
@@ -122,7 +122,7 @@ class GroupsServer(commonGroups.GroupsCommonMixin, objects.ObjectsServer):
         if not self.isAdmin():
             clientToken = context.getVar('clientToken')
             clientId = getApplicationId(clientToken)
-            clientNameAndPort, clientRole = splitApplicationId(clientId)
+            clientNameAndPort, clientRole, mu = commonTools.splitId(clientId)
             if clientRole != 'people':
                 raise faults.UserAccessDenied()
         object = virtualServer.loadObjectCore(objectId)
@@ -156,7 +156,7 @@ class GroupsServer(commonGroups.GroupsCommonMixin, objects.ObjectsServer):
         if not self.isAdmin():
             clientToken = context.getVar('clientToken')
             clientId = getApplicationId(clientToken)
-            clientNameAndPort, clientRole = splitApplicationId(clientId)
+            clientNameAndPort, clientRole, mu = commonTools.splitId(clientId)
             if clientRole != 'people':
                 raise faults.UserAccessDenied()
         object = virtualServer.loadObjectCore(objectId)
diff --git a/servers/PreferencesServer/PreferencesServer.py b/servers/PreferencesServer/PreferencesServer.py
index 27eed9c4..09b868d3 100755
--- a/servers/PreferencesServer/PreferencesServer.py
+++ b/servers/PreferencesServer/PreferencesServer.py
@@ -55,6 +55,7 @@ import glasnost
 
 import glasnost.common.faults as faults
 from glasnost.common.PreferencesCommon import PreferenceCommon
+import glasnost.common.tools_new as commonTools
 import glasnost.common.xhtmlgenerator as X
 
 from glasnost.server.ObjectsServer import Server, VirtualServer
@@ -153,7 +154,8 @@ class PreferencesServer(Server):
                     '__thingName__': 'preferences.Preference',
                     'version': 0,
                     }
-        serverHostNameAndPort, serverRole, localId = splitObjectId(id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(id)
         if preference.has_key('objectsMemory'):
             objectsMemory = preference['objectsMemory']
         else:
diff --git a/servers/TranslationsServer/TranslationsServer.py b/servers/TranslationsServer/TranslationsServer.py
index a5bf88c9..91b30b2a 100755
--- a/servers/TranslationsServer/TranslationsServer.py
+++ b/servers/TranslationsServer/TranslationsServer.py
@@ -58,6 +58,7 @@ import glasnost
 
 import glasnost.common.faults as faults
 from glasnost.common.TranslationsCommon import *
+import glasnost.common.tools_new as commonTools
 import glasnost.common.xhtmlgenerator as X
 
 from glasnost.server.ObjectsServer import register, AdministrableServerMixin, \
@@ -540,7 +541,7 @@ class TranslationsServer(TranslationsCommonMixin, AdministrableServerMixin,
             destinationLanguages, ignoreNew = 0):
         virtualServerId = context.getVar('applicationId')
         virtualServer = self.getVirtualServer(virtualServerId)
-        if splitObjectId(sourceId)[1] == 'virtualhosts':
+        if commonTools.extractRole(sourceId) == 'virtualhosts':
             try:
                 virtualHost = getProxy(sourceId).getObject(sourceId)
             except (faults.MissingItem, faults.UserAccessDenied,
diff --git a/servers/UploadFilesServer/UploadFilesServer.py b/servers/UploadFilesServer/UploadFilesServer.py
index 92576dab..e3ef3455 100755
--- a/servers/UploadFilesServer/UploadFilesServer.py
+++ b/servers/UploadFilesServer/UploadFilesServer.py
@@ -66,6 +66,7 @@ import glasnost
 
 from glasnost.common.UploadFilesCommon import *
 import glasnost.common.faults as faults
+import glasnost.common.tools_new as commonTools
 import glasnost.common.xhtmlgenerator as X
 
 from glasnost.server.ObjectsServer import register, ObjectServerMixin, \
@@ -99,7 +100,8 @@ class UploadFile(ObjectServerMixin, UploadFileCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         uploadFilesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         dataFilePath = os.path.join(uploadFilesDirectoryPath, localId)
         try:
             dataFile = open(dataFilePath, 'rb')
@@ -138,7 +140,8 @@ class UploadFile(ObjectServerMixin, UploadFileCommon):
         virtualServer = self.getServer().getVirtualServer(virtualServerId)
         uploadFilesDirectoryPath = os.path.join(
             virtualServer.dataDirectoryPath, self.getServer().applicationRole)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         dataFilePath = os.path.join(uploadFilesDirectoryPath, localId)
         try:
             os.remove(dataFilePath)
@@ -168,7 +171,8 @@ class UploadFile(ObjectServerMixin, UploadFileCommon):
         if not os.access(uploadFilesDirectoryPath, os.F_OK):
             os.mkdir(uploadFilesDirectoryPath)
             os.chmod(uploadFilesDirectoryPath, 0750)
-        serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+        serverHostNameAndPort, serverRole, localId = \
+                commonTools.splitId(self.id)
         dataFilePath = os.path.join(uploadFilesDirectoryPath, localId)
         dataFile = open(dataFilePath, 'wb')
         os.chmod(dataFilePath, 0640)
@@ -247,7 +251,7 @@ class UploadFilesServer(UploadFilesCommonMixin, ObjectsServer):
             destinationVirtualServerDataDirectoryPath, self.applicationRole)
         for id in virtualServer.objects.keys():
             serverHostNameAndPortNotUsed, serverRoleNotUsed, localId = \
-                                          splitObjectId(id)
+                    commonTools.splitId(id)
             sourceDataFilePath = os.path.join(
                 sourceObjectsDirectoryPath, localId)
             destinationDataFilePath = os.path.join(
@@ -284,7 +288,7 @@ class UploadFilesServer(UploadFilesCommonMixin, ObjectsServer):
             exportDirectoryPath, self.applicationRole)
         for id in virtualServer.objects.keys():
             serverHostNameAndPortNotUsed, serverRoleNotUsed, localId = \
-                                          splitObjectId(id)
+                    commonTools.splitId(id)
             sourceBodyFilePath = os.path.join(
                 objectsDirectoryPath, localId)
             exportBodyFilePath = os.path.join(
@@ -342,7 +346,7 @@ class UploadFilesServer(UploadFilesCommonMixin, ObjectsServer):
             virtualServerDataDirectoryPath, self.applicationRole)
         for id in virtualServer.objects.keys():
             serverHostNameAndPortNotUsed, serverRoleNotUsed, localId = \
-                                          splitObjectId(id)
+                    commonTools.splitId(id)
             importBodyFilePath = os.path.join(
                 importObjectsDirectoryPath, localId)
             destinationBodyFilePath = os.path.join(
diff --git a/servers/VirtualHostsServer/VirtualHostsServer.py b/servers/VirtualHostsServer/VirtualHostsServer.py
index b61826b3..b890b1b3 100755
--- a/servers/VirtualHostsServer/VirtualHostsServer.py
+++ b/servers/VirtualHostsServer/VirtualHostsServer.py
@@ -47,8 +47,11 @@ __version__ = '$Revision$'[11:-2]
 
 
 from fnmatch import fnmatch
+import os
+import sgmllib
 import sys
 
+
 glasnostPythonDir = '/usr/local/lib/glasnost-devel' # changed on make install
 sys.path.insert(0, glasnostPythonDir)
 
@@ -78,11 +81,62 @@ class AdminVirtualHosts(AdminServerMixin, AdminVirtualHostsCommon):
 register(AdminVirtualHosts)
 
 
+class VirtualHostXmlParser(sgmllib.SGMLParser):
+    inCustomWeb = 0
+    customWeb = None
+    customWebs = None
+    currentRole = None
+    
+    inLocale = 0
+    locale = None
+
+    def __init__(self, body):
+        sgmllib.SGMLParser.__init__(self)
+        self.customWebs = {}
+        self.feed(body)
+
+    def start_customweb(self, attrs):
+        if attrs[0][0] == 'role':
+            self.currentRole = str(attrs[0][1])
+            self.inCustomWeb = 1
+            self.customWeb = ''
+    
+    def end_customweb(self):
+        if self.inCustomWeb:
+            self.inCustomWeb = 0
+            self.customWebs[self.currentRole] = self.customWeb
+
+    def start_locale(self, attrs):
+        self.inLocale = 1
+        self.locale = ''
+
+    def end_locale(self):
+        self.locale = self.locale.strip()
+        self.inLocale = 0
+
+    def handle_data(self, data):
+        if self.inCustomWeb:
+            self.customWeb += data
+        if self.inLocale:
+            self.locale += data
+
+
 class VirtualHost(ObjectServerMixin, VirtualHostCommon):
-    strings = None
-    strings_keyType = 'string'
-    strings_type = 'mapping'
-    strings_valueType = 'string'
+    def acquireNonCore(self, objectDirectoryPath = None,
+                       dataDirectoryPath = None, parentSlot = None):
+        ObjectServerMixin.acquireNonCore(
+            self, objectDirectoryPath = objectDirectoryPath,
+            dataDirectoryPath = dataDirectoryPath, parentSlot = parentSlot)
+        print 'acquireNonCore'
+        self.customWebs = {}
+        self.locales = []
+        profilesPath = os.path.join(commonTools.configDir, 'profiles')
+        for p in self.profiles:
+            pFileName = os.path.join(profilesPath, p + '.xml')
+            vhP = VirtualHostXmlParser(open(pFileName).read())
+            self.customWebs.update(vhP.customWebs)
+            if vhP.locale:
+                self.locales.append(vhP.locale)
 
     def checkModifyIsPossible(self, changes, givenSlotNames = None):
         ObjectServerMixin.checkModifyIsPossible(
@@ -110,6 +164,14 @@ class VirtualHost(ObjectServerMixin, VirtualHostCommon):
                 del objectsByHostName[hostName]
             if self.hostName is not None:
                 objectsByHostName[self.hostName] = self
+
+    def releaseNonCore(self, parentSlot = None):
+        if self.__dict__.has_key('customWebs'):
+            del self.customWebs
+        if self.__dict__.has_key('locales'):
+            del self.locales
+        ObjectServerMixin.releaseNonCore(self, parentSlot = parentSlot)
+
 register(VirtualHost)
 
 
@@ -204,7 +266,7 @@ class VirtualHostsServer(VirtualHostsCommonMixin, ObjectsServer):
             virtualServer.markObjectAsDirty(object)
 
         newDispatcherId = object.defaultDispatcherId
-        registerDispatcherId(newDispatcherId)
+        registerDispatcherId(newDispatcherId, object.profiles)
         newVirtualServerId = commonTools.makeApplicationId(
                 newDispatcherId, self.applicationRole)
         context.push(
@@ -237,19 +299,29 @@ class VirtualHostsServer(VirtualHostsCommonMixin, ObjectsServer):
         """Return the url of the virtual server."""
         
         virtualServerId = context.getVar('applicationId')
-        print 'getHostName for', virtualServerId
         virtualServer = self.getVirtualServer(virtualServerId)
         dispatcherId = commonTools.extractDispatcherId(
                 virtualServerId).lower()
         for object in virtualServer.objects.values():
             if dispatcherId == commonTools.extractDispatcherId(
                         object.defaultDispatcherId).lower():
-                return utf8('http://' + object.hostName)
+                return utf8(object.hostName)
         raise faults.MissingItem(dispatcherId)
 
-    def getObjectByHostName(self, hostName):
-        """Return the virtual host with the given host name."""
-        
+    def getObjectByHostNameXmlRpc(self, hostName):
+        hostName = iso8859_15(hostName)
+        virtualServerId = context.getVar('applicationId')
+        virtualServer = self.getVirtualServer(virtualServerId)
+        objectId = self.getObjectIdByHostName(hostName)
+        object = virtualServer.objectsByHostName[hostName]
+        object.acquireNonCore()
+        try:
+            result = object.exportToXmlRpc()
+        finally:
+            object.releaseNonCore()
+        return result
+
+    def getObjectIdByHostName(self, hostName):
         virtualServerId = context.getVar('applicationId')
         virtualServer = self.getVirtualServer(virtualServerId)
         askedHostName = hostName
@@ -261,6 +333,7 @@ class VirtualHostsServer(VirtualHostsCommonMixin, ObjectsServer):
             object.hostName = hostName
             object.defaultDispatcherId = 'glasnost://%s' % hostName
             object.language = 'en'
+            object.profiles = ['basic', 'cms', 'vote']
             object.writersSet = [system.generalPublicId]
             object.readersSet = [system.generalPublicId]
             context.push(noVirtualHost = 1)
@@ -284,17 +357,13 @@ class VirtualHostsServer(VirtualHostsCommonMixin, ObjectsServer):
                             virtualServer.admin.defaultVirtualHostId]
                 except KeyError:
                     raise faults.MissingItem(hostName)
-                return object
+                return object.id
         object = virtualServer.objectsByHostName[hostName]
-        return object
-
-    def getObjectByHostNameXmlRpc(self, hostName):
-        hostName = iso8859_15(hostName)
-        return self.getObjectByHostName(hostName).exportToXmlRpc()
+        return object.id
 
     def getObjectIdByHostNameXmlRpc(self, hostName):
         hostName = iso8859_15(hostName)
-        return self.getObjectByHostName(hostName).id
+        return self.getObjectIdByHostName(hostName)
 
     def hasDispatcherIdXmlRpc(self, dispatcherId):
         virtualServerId = context.getVar('applicationId')
@@ -329,11 +398,18 @@ class VirtualHostsServer(VirtualHostsCommonMixin, ObjectsServer):
         return ObjectsServer.isAdmin(self)
 
     def modifyObjectXmlRpc(self, objectImport):
-        version = ObjectsServer.modifyObjectXmlRpc(self, objectImport)
         id = objectImport['id']
         virtualServerId = context.getVar('applicationId')
         virtualServer = self.getVirtualServer(virtualServerId)
+        oldObject = virtualServer.loadObjectCore(id)
+        version = ObjectsServer.modifyObjectXmlRpc(self, objectImport)
         object = virtualServer.loadObjectCore(id)
+
+        oldObject.profiles.sort()
+        object.profiles.sort()
+        if oldObject.profiles != object.profiles:
+            # FIXME: update profiles (for now it is needed to restart Glasnost)
+            pass
         self.updateApacheVHost(object)
         return version
 
@@ -352,7 +428,7 @@ class VirtualHostsServer(VirtualHostsCommonMixin, ObjectsServer):
         ObjectsServer.registerToDispatcher(self)
         for virtualHost in self.virtualServer.objects.values():
             newDispatcherId = virtualHost.defaultDispatcherId
-            registerDispatcherId(newDispatcherId)
+            registerDispatcherId(newDispatcherId, virtualHost.profiles)
             newVirtualServerId = commonTools.makeApplicationId(
                     newDispatcherId, self.applicationRole)
             context.push(
@@ -390,6 +466,7 @@ class VirtualHostsServer(VirtualHostsCommonMixin, ObjectsServer):
                     object.defaultDispatcherId = object.defaultDispatcherId[
                             :-1]
                     changed = 1
+
         if changed:
             virtualServer.markAllAsDirtyFIXME()
 
@@ -450,6 +527,11 @@ class VirtualHostsServer(VirtualHostsCommonMixin, ObjectsServer):
                 virtualServer.objectsByHostName[object.hostName] = object
         virtualServer.markCoreAsDirty()
 
+    def upgrade_0001_0027(self, virtualServer):
+        for object in virtualServer.objects.values():
+            object.profiles = ['basic', 'cms', 'vote', 'translations']
+        virtualServer.markCoreAsDirty()
+
 virtualHostsServer = VirtualHostsServer()
 
 
diff --git a/servers/VotesServer/VotesServer.py b/servers/VotesServer/VotesServer.py
index 7382458b..4e654063 100755
--- a/servers/VotesServer/VotesServer.py
+++ b/servers/VotesServer/VotesServer.py
@@ -55,6 +55,7 @@ import glasnost
 
 from glasnost.common.VotesCommon import *
 import glasnost.common.faults as faults
+import glasnost.common.tools_new as commonTools
 import glasnost.common.xhtmlgenerator as X
 
 from glasnost.server.ObjectsServer import register, ObjectServerMixin, \
@@ -82,25 +83,25 @@ class VoteMixin(ObjectServerMixin):
     def canBeCreatedByClient(self):
         clientToken = context.getVar('clientToken')
         clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
+        clientNameAndPort, clientRole, mu = commonTools.splitId(clientId)
         return clientRole == 'ballots'
 
     def canBeDeletedByClient(self):
         clientToken = context.getVar('clientToken')
         clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
+        clientNameAndPort, clientRole, mu = commonTools.splitId(clientId)
         return clientRole == 'ballots'
 
     def canBeGottenByClient(self):
         clientToken = context.getVar('clientToken')
         clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
+        clientNameAndPort, clientRole, mu = commonTools.splitId(clientId)
         return clientRole == 'ballots'
 
     def canBeModifiedByClient(self):
         clientToken = context.getVar('clientToken')
         clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
+        clientNameAndPort, clientRole, mu = commonTools.splitId(clientId)
         return clientRole == 'ballots'
 
 
diff --git a/shared/common/CardsCommon.py b/shared/common/CardsCommon.py
index dcc96898..0687088c 100644
--- a/shared/common/CardsCommon.py
+++ b/shared/common/CardsCommon.py
@@ -72,7 +72,7 @@ class CardCommon(ObjectCommon):
         label = N_('Create Mode')
         widget_noneLabel = N_('Inherited')
 
-        def getValues(self, slot, fields):
+        def getValues(self, slot):
             card = slot.getContainer()
             return card.getModeNames()
 
@@ -84,7 +84,7 @@ class CardCommon(ObjectCommon):
         stateInViewMode = 'hidden'
         widget_noneLabel = N_('Inherited')
 
-        def getValues(self, slot, fields):
+        def getValues(self, slot):
             return ['viewAll']
 
     defaultModeName = None
@@ -93,7 +93,7 @@ class CardCommon(ObjectCommon):
         label = N_('Default Mode')
         widget_noneLabel = N_('Inherited')
 
-        def getValues(self, slot, fields):
+        def getValues(self, slot):
             card = slot.getContainer()
             return card.getModeNames()
 
@@ -106,7 +106,7 @@ class CardCommon(ObjectCommon):
         stateInViewMode = 'hidden'
         valueThingName = 'Edit'
 
-        def getLabels(self, slot, fields):
+        def getLabels(self, slot):
             return {'Edit': slot.getValue().getMenuLabel()}
 
         def getter(self, slot):
@@ -129,7 +129,7 @@ class CardCommon(ObjectCommon):
             _kindName = 'Mode'
             values = [None, 'Custom']
 
-            def getLabels(self, slot, fields):
+            def getLabels(self, slot):
                 card = slot.parent.getContainer()
                 if card.modes is not None and len(card.modes) > slot.index \
                        and card.modes[slot.index] is not None:
@@ -163,7 +163,7 @@ class CardCommon(ObjectCommon):
         stateInViewMode = 'hidden'
         valueThingName = 'View'
 
-        def getLabels(self, slot, fields):
+        def getLabels(self, slot):
             return {'View': slot.getValue().getMenuLabel()}
 
         def getter(self, slot):
diff --git a/shared/common/CommentsCommon.py b/shared/common/CommentsCommon.py
index 9fa12163..b20722bb 100644
--- a/shared/common/CommentsCommon.py
+++ b/shared/common/CommentsCommon.py
@@ -69,28 +69,30 @@ class CommentCommon(ObjectCommon):
     creationTime_kind_importExport = 'from-server-only'
     creationTime_kindName = 'CreationTime'
 
-    serverRole = 'comments'
+    isEditorial = 0
+    class isEditorial_kindClass:
+        _kindName = 'Boolean'
+        label = N_('Editorial Comment ?')
 
     parentId = None
     parentId_kindName = 'Id'
 
-    title = None
-    title_kind_balloonHelp = N_('Enter the title of your comment.')
-    title_kind_isRequired = 1
-    title_kindName = 'String'
+    serverRole = 'comments'
 
     def canCache(self):
         return 1
 
     def getLabel(self):
-        if self.title:
-            return self.title
-        return 'some comment'
+        return _('some comment')
+
+    def getLabelLanguage(self):
+        '''Return an empty string so that label is not translated'''
+        return ''
 
     def getOrderedLayoutSlotNames(self, parentSlot = None):
         slotNames = ObjectCommon.getOrderedLayoutSlotNames(
             self, parentSlot = parentSlot)
-        slotNames += ['title', 'authorId', 'body' ]
+        slotNames += ['authorId', 'body' ]
         return slotNames
 
 
diff --git a/shared/common/ObjectsCommon.py b/shared/common/ObjectsCommon.py
index 3686967c..f4cd40e5 100644
--- a/shared/common/ObjectsCommon.py
+++ b/shared/common/ObjectsCommon.py
@@ -193,11 +193,11 @@ class ObjectsCommonMixin:
         The capitalized 'gettextized' handled object class name string.
     
     *objectsName*:
-        The 'gettextized' functionnal class name string (Usualy the class name
+        The 'gettextized' functionnal class name string (Usually the class name
         without the type (proxy or server, etc...)).
         
     *objectsNameCapitalized*:
-        The capitalized 'gettextized'  class name string (Usualy the class name
+        The capitalized 'gettextized'  class name string (Usually the class name
         without the type (proxy or server, etc...)).
     
     *serverRole*:
diff --git a/shared/common/PeopleCommon.py b/shared/common/PeopleCommon.py
index 38bb2234..4090eb0b 100644
--- a/shared/common/PeopleCommon.py
+++ b/shared/common/PeopleCommon.py
@@ -257,11 +257,11 @@ class PeopleCommonMixin(ObjectsCommonMixin):
         The capitalized 'gettextized' handled object class name string.
     
     *objectsName*:
-        The 'gettextized' functionnal class name string (Usualy the class name
+        The 'gettextized' functionnal class name string (Usually the class name
         without the type (proxy or server, etc...)).
         
     *objectsNameCapitalized*:
-        The capitalized 'gettextized'  class name string (Usualy the class name
+        The capitalized 'gettextized'  class name string (Usually the class name
         without the type (proxy or server, etc...)).
     
     *serverRole*:
diff --git a/shared/common/VirtualHostsCommon.py b/shared/common/VirtualHostsCommon.py
index 692a3e8d..29052c37 100644
--- a/shared/common/VirtualHostsCommon.py
+++ b/shared/common/VirtualHostsCommon.py
@@ -51,6 +51,7 @@ from ObjectsCommon import AdminCommon, ObjectCommon, ObjectsCommonMixin
 import system
 
 import glasnost.common.context as context
+import glasnost.common.tools_new as commonTools
 
 class AdminVirtualHostsCommon(AdminCommon):
     defaultVirtualHostId = None
@@ -91,6 +92,28 @@ class VirtualHostInfoParser(sgmllib.SGMLParser):
             self.label += data
 
 
+class ProfileParser(sgmllib.SGMLParser):
+    inDescription = 0
+    description = None
+    def __init__(self, body):
+        sgmllib.SGMLParser.__init__(self)
+        self.feed(body)
+
+    def start_description(self, attrs):
+        if len(attrs) == 0:
+            self.inDescription = 1
+            self.description = ''
+
+    def end_description(self):
+        self.inDescription = 0
+        if self.description:
+            self.description = self.description.strip()
+
+    def handle_data(self, data):
+        if self.inDescription:
+            self.description += data
+
+
 class VirtualHostCommon(ObjectCommon):
     """Virtual host super class used to be inherited with a Mixin Class.
 
@@ -102,6 +125,21 @@ class VirtualHostCommon(ObjectCommon):
     creationTime = None
     creationTime_kindName = 'CreationTime'
 
+    customWebs = None
+    customWebs_kind_importExport = 'from-server-only'
+    customWebs_kind_keyKind_valueName = 'String'
+    customWebs_kind_valueKind_valueName = 'String'
+    customWebs_kind_stateInViewMode = 'hidden'
+    customWebs_kind_stateInEditMode = 'hidden'
+    customWebs_kindName = 'Mapping'
+
+    locales = None
+    locales_kind_itemKind_valueName = 'String'
+    locales_kind_importExport = 'from-server-only'
+    locales_kind_stateInViewMode = 'hidden'
+    locales_kind_stateInEditMode = 'hidden'
+    locales_kindName = 'Sequence'
+
     defaultDispatcherId = None
     defaultDispatcherId_kind_balloonHelp = N_(
             'Enter the Glasnost dispatcher id for this virtual host '\
@@ -128,8 +166,42 @@ class VirtualHostCommon(ObjectCommon):
     modificationTime = None
     modificationTime_kindName = 'ModificationTime'
 
+    profiles = None
+    class profiles_kindClass:
+        _kindName = 'Sequence'
+        defaultValue = ['basic', 'cms', 'vote']
+        requiredCount = 1
+        label = N_('Usage Profiles')
+        class itemKind_valueClass:
+            _kindName = 'Choice'
+            def getLabels(self, slot):
+                profilesPath = os.path.join(commonTools.configDir, 'profiles')
+                profiles = self.getValues(slot)
+                labels = {}
+                for p in profiles:
+                    pFileName = os.path.join(profilesPath, p + '.xml')
+                    label = ProfileParser(open(pFileName).read()).description
+                    labels[p] = label
+                return labels
+
+            def getSortedValues(self, slot):
+                # puts 'basic' first
+                values = self.getValues(slot)
+                values.sort()
+                values.remove('basic')
+                values.insert(0, 'basic')
+                return values
+                
+            def getValues(self, slot):
+                profilesPath = os.path.join(commonTools.configDir, 'profiles')
+                profiles = os.listdir(profilesPath)
+                values = [x[:-4] for x in profiles if x.endswith('.xml')]
+                return values
+
+        widgetName = 'MultiCheck'
+
     readersSet = None
-    readersSet_kind_itemKind_value_defaultValue = system.generalPublicId
+    readersSet_defaultValue = [system.generalPublicId]
     readersSet_kindName = 'ReadersSet'
 
     serverRole = 'virtualhosts'
@@ -144,7 +216,7 @@ class VirtualHostCommon(ObjectCommon):
         isRequired = 1
         defaultValue = 'glasnost2'
         label = N_('Template')
-        def getValues(self, slot, fields):
+        def getValues(self, slot):
             templatesDirectoryPath = context.getVar('templatesDirectoryPath')
             dirs = os.listdir(templatesDirectoryPath)
             values = []
@@ -155,9 +227,9 @@ class VirtualHostCommon(ObjectCommon):
             values.sort()
             return values
 
-        def getLabels(self, slot, fields):
+        def getLabels(self, slot):
             templatesDirectoryPath = context.getVar('templatesDirectoryPath')
-            dirs = self.getValues(slot, fields)
+            dirs = self.getValues(slot)
             labels = {}
             for d in dirs:
                 infosName = os.path.join(templatesDirectoryPath, d, 'infos.xml')
@@ -249,11 +321,11 @@ class VirtualHostsCommonMixin(ObjectsCommonMixin):
         The capitalized 'gettextized' handled object class name string.
     
     *objectsName*:
-        The 'gettextized' functionnal class name string (Usualy the class name
+        The 'gettextized' functionnal class name string (Usually the class name
         without the type (proxy or server, etc...)).
         
     *objectsNameCapitalized*:
-        The capitalized 'gettextized'  class name string (Usualy the class name
+        The capitalized 'gettextized'  class name string (Usually the class name
         without the type (proxy or server, etc...)).
     
     *serverRole*:
diff --git a/shared/common/XhtmlGenerator.py b/shared/common/XhtmlGenerator.py
index 72f6920d..434ca01e 100755
--- a/shared/common/XhtmlGenerator.py
+++ b/shared/common/XhtmlGenerator.py
@@ -733,12 +733,12 @@ def convertStringToXml(s):
 
 
 def convertStringToXmlAttributeValue(s):
-    ### FIXME: Which characters should be transcoded?
-    s = s.replace('&', '&amp;') # ?
-    s = s.replace('"', '&quot;') # '"' must be converted.
-    s = s.replace('<', '&lt;') # ?
-    s = s.replace('>', '&gt;') # ?
-    return s
+    return s.replace(
+            '&', '&amp;').replace(
+            '"', '&quot;').replace(
+            '\'', '&apos;').replace(
+            '<', '&lt;').replace(
+            '>', '&gt;')
 
 
 def enclose(object, **enclosingAttributes):
diff --git a/shared/common/faults.py b/shared/common/faults.py
index 1b4dbdd2..c8812065 100644
--- a/shared/common/faults.py
+++ b/shared/common/faults.py
@@ -92,6 +92,7 @@ faultCodeStringNotAvailableThroughGettext = 39
 faultCodeUnknownCommandAction = 40
 faultCodeValueTooBig = 41
 faultCodeValueTooSmall = 42
+faultCodeRoleNotInProfiles = 43
 
 faultCodeUnknownVoteToken = 1000
 faultCodeUnknownVoterToken = 1001
@@ -552,6 +553,12 @@ class ValueTooBig(BaseFault):
         return 'Value (= %s) too big for slot "%s"' % (value, slot)
 
 
+class RoleNotInProfiles(BaseFault):
+    faultCode = faultCodeRoleNotInProfiles
+    uiFaultString = N_('Role not in profiles')
+
+    def makeFaultString(self, role):
+        return 'Role (%s) not in profiles' % role
 
 # Dataflow.
 
diff --git a/shared/common/kinds.py b/shared/common/kinds.py
index 5b6045c4..fe3c507a 100644
--- a/shared/common/kinds.py
+++ b/shared/common/kinds.py
@@ -435,13 +435,13 @@ class BaseKind(things.BaseThing):
         isRequired = 1
         label = N_('Widget')
 
-        def getGroupedValues(self, slot, fields):
+        def getGroupedValues(self, slot):
             return (None, None) # groupNames, groupedValues
 
         def getter(self, slot):
             return slot.getContainer().getModelWidget(slot.parent)
 
-        def getValues(self, slot, fields):
+        def getValues(self, slot):
             values = slot.getContainer().getPossibleWidgetNames()
             if values:
                 return values
@@ -1017,22 +1017,22 @@ class Boolean(BaseKind):
             return str(value)
         return BaseKind.convertValueToOtherType(self, value, otherType)
 
-    def getGroupedValues(self, slot, fields):
+    def getGroupedValues(self, slot):
         return (None, None) # groupNames, groupedValues
 
-    def getLabels(self, slot, fields):
+    def getLabels(self, slot):
         return self.labels
 
-    def getSortedValues(self, slot, fields):
-        values = self.getValues(slot, fields)
+    def getSortedValues(self, slot):
+        values = self.getValues(slot)
         if values is not None:
             values = values[:]
-            labels = self.getLabels(slot, fields)
+            labels = self.getLabels(slot)
             values.sort(lambda x, y:
                         locale.strcoll(_(labels[x]), _(labels[y])))
         return values
 
-    def getValues(self, slot, fields):
+    def getValues(self, slot):
         return self.values
 
     def getOrderedLayoutSlotNames(self, parentSlot = None):
@@ -1129,10 +1129,10 @@ class Choice(BaseKind):
 
     def checkModelValue(self, slot, value):
         BaseKind.checkModelValue(self, slot, value)
-        if value and self.values and value not in self.getValues(slot, {}):
+        if value and self.values and value not in self.getValues(slot):
             raise faults.BadSlotValue(slot, value)
 
-    def getGroupedValues(self, slot, fields):
+    def getGroupedValues(self, slot):
         if self.groupedValuesGetterName:
             currentSlot = slot
             while currentSlot is not None:
@@ -1140,22 +1140,22 @@ class Choice(BaseKind):
                 try:
                     groupedValuesGetter = getattr(container,
                                                   self.groupedValuesGetterName)
-                    self.groupedValues = groupedValuesGetter(slot, fields)
+                    self.groupedValues = groupedValuesGetter(slot)
                     if self.groupNamesGetterName:
                         groupNamesGetter = getattr(container,
                                                    self.groupNamesGetterName)
-                        self.groupNames = groupNamesGetter(slot, fields)
+                        self.groupNames = groupNamesGetter(slot)
                         break
                 except AttributeError:
                     currentSlot = currentSlot.parent
                     continue
         return (self.groupNames, self.groupedValues)
 
-    def getLabels(self, slot, fields):
+    def getLabels(self, slot):
         if self.labels:
             return self.labels
         labels = {}
-        values = self.getValues(slot, fields)
+        values = self.getValues(slot)
         if values is not None:
             for value in values:
                 labels[str(value)] = str(value)
@@ -1167,8 +1167,8 @@ class Choice(BaseKind):
         slotNames += ['values', 'labels', 'titles']
         return slotNames
 
-    def getSortedValues(self, slot, fields):
-        values = self.getValues(slot, fields)
+    def getSortedValues(self, slot):
+        values = self.getValues(slot)
         if values is None:
             return None
         values = values[:]
@@ -1179,12 +1179,12 @@ class Choice(BaseKind):
         if '__all__' in values:
             sortedValues.append('__all__')
             values.remove('__all__')
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
         values.sort(lambda x, y: locale.strcoll(_(labels[x]), _(labels[y])))
         sortedValues += values
         return sortedValues
 
-    def getValues(self, slot, fields):
+    def getValues(self, slot):
         groupedValuesGetterName = self.groupedValuesGetterName
         if groupedValuesGetterName is not None:
             currentSlot = slot
@@ -1196,7 +1196,7 @@ class Choice(BaseKind):
                 except AttributeError:
                     currentSlot = currentSlot.parent
                     continue
-                groupedValues = groupedValuesGetter(slot, fields)
+                groupedValues = groupedValuesGetter(slot)
                 assert type(groupedValues) is type({})
                 values = []
                 for group in groupedValues.keys():
@@ -1214,7 +1214,7 @@ class Choice(BaseKind):
                 except AttributeError:
                     currentSlot = currentSlot.parent
                     continue
-                return valuesGetter(slot, fields)
+                return valuesGetter(slot)
             return []
         if self.groupedValues:
             result = []
@@ -1504,44 +1504,6 @@ class Float(BaseKind):
 register(Float)
 
 
-class FunctionName(Choice):
-    defaultValue_kindName = 'FunctionName'
-
-    pythonStorageType = types.StringType
-
-    serverIdSlotName = None
-    serverIdSlotName_kindName = 'String'
-
-    thingPublicCategory = None # N_('Glasnost')
-
-    thingPublicName = N_('Function Name')
-
-    def getValues(self, slot, fields):
-        if not self.serverIdSlotName:
-            return []
-        serverId = slot.getContainer().getSlot(
-            self.serverIdSlotName, parentSlot = slot.parent).getField(fields)
-        if not serverId:
-            return []
-        try:
-            serverRole = commonTools.extractRole(serverId)
-        except: # TODO: tighter check
-            return []
-        from glasnost.proxy.tools import getProxyForServerRole
-        try:
-            proxy = getProxyForServerRole(serverRole)
-        except: # TODO: tighter check
-            return []
-        if proxy is None:
-            return []
-        try:
-            functionDeclarations = proxy.getFunctionDeclarations() 
-        except: # TODO: tighter check
-            return []
-        return functionDeclarations.keys()
-register(FunctionName)
-
-
 class Id(BaseKind):
     containerNames = ['Any']
 
@@ -1595,8 +1557,8 @@ class Id(BaseKind):
             kindServerRoles.sort()
         return serverRoles == kindServerRoles
 
-    def getLabels(self, slot, fields):
-        values = self.getValues(slot, fields)
+    def getLabels(self, slot):
+        values = self.getValues(slot)
         from glasnost.proxy.tools import getObjectLabelsTranslated
         labels = getObjectLabelsTranslated(values,
                 context.getVar('readLanguages'))
@@ -1605,7 +1567,7 @@ class Id(BaseKind):
     def getServerRoles(self, slot):
         return self.serverRoles
 
-    def getValues(self, slot, fields):
+    def getValues(self, slot):
         valuesGetterName = self.valuesGetterName
         if valuesGetterName is not None:
             currentSlot = slot
@@ -1616,7 +1578,7 @@ class Id(BaseKind):
                 except AttributeError:
                     currentSlot = currentSlot.parent
                     continue
-                return valuesGetter(slot, fields)
+                return valuesGetter(slot)
 
         # TODO:
         #  1. remove valuesGetterName since getValues() can now be redefined
@@ -3118,8 +3080,8 @@ class ServerRole(Choice):
 
     thingPublicName = N_('Server Role')
 
-    def getLabels(self, slot, fields):
-        roles = self.getValues(slot, fields)
+    def getLabels(self, slot):
+        roles = self.getValues(slot)
         labels = {}
         for role in roles:
             if role in [None, '__all__']:
@@ -3132,7 +3094,7 @@ class ServerRole(Choice):
             labels[role] = label
         return labels
 
-    def getValues(self, slot, fields):
+    def getValues(self, slot):
         from glasnost.proxy.DispatcherProxy import getRegisteredRoles
         values = []
         if self.allowNone:
@@ -3389,7 +3351,7 @@ class Thing(Choice):
             return None
         return value.exportToXmlRpc(parentSlot = slot)
 
-    def getGroupedValues(self, slot, fields):
+    def getGroupedValues(self, slot):
         categories = []
         groupedValues = {}
         for thingClass in commonTools.getAllThingClasses().values():
@@ -3403,7 +3365,7 @@ class Thing(Choice):
             groupedValues[thingClass.thingPublicCategory].append(
                     thingClass.getThingName.im_func(thingClass))
         categories.sort(lambda x, y: locale.strcoll(_(x), _(y)))
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
         for values in groupedValues.values():
             values.sort(lambda x, y:
                         locale.strcoll(_(labels[x]), _(labels[y])))
@@ -3414,7 +3376,7 @@ class Thing(Choice):
                 self.valueThingCategory, self.valueThingName)
         return value.getDefaultValue(slot)
 
-    def getLabels(self, slot, fields):
+    def getLabels(self, slot):
         if self.labels is not None:
             return self.labels
         self.labels = {}
@@ -3461,7 +3423,7 @@ class Thing(Choice):
             widget.buildOptions(widgetOptions)
             return widget
 
-    def getValues(self, slot, fields):
+    def getValues(self, slot):
         if self.values is not None:
             return self.values
         self.values = [
@@ -3781,7 +3743,7 @@ class XChoice(Choice):
     thingPublicName = N_('Extended Choice')
     widgetName = 'XSelect'
 
-    def getGroupedValues(self, slot, fields):
+    def getGroupedValues(self, slot):
         return (self.groupNames, self.groupedValues)
 register(XChoice)
 
@@ -3871,7 +3833,7 @@ class KindName(Choice):
 ##                 for kindClass in commonTools.getAllThingClasses().values()
 ##                 if kindClass.thingCategory == 'kind']
 
-    def getGroupedValues(self, slot, fields):
+    def getGroupedValues(self, slot):
         categories = []
         groupedValues = {}
         for kindClass in commonTools.getAllThingClasses().values():
@@ -3885,13 +3847,13 @@ class KindName(Choice):
             groupedValues[kindClass.thingPublicCategory].append(
                 kindClass.getThingName.im_func(kindClass))
         categories.sort(lambda x, y: locale.strcoll(_(x), _(y)))
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
         for values in groupedValues.values():
             values.sort(lambda x, y:
                         locale.strcoll(_(labels[x]), _(labels[y])))
         return (categories, groupedValues) # groupNames, groupedValues
 
-    def getValues(self, slot, fields):
+    def getValues(self, slot):
         return [
                 kindClass.getThingName.im_func(kindClass)
                 for kindClass in commonTools.getAllThingClasses().values()
@@ -3922,7 +3884,7 @@ class Mode(Thing):
             return value.getThingName()
         return BaseKind.convertValueToOtherType(self, value, otherType)
 
-    def getGroupedValues(self, slot, fields):
+    def getGroupedValues(self, slot):
         return (None, None) # groupNames, groupedValues
 register(Mode)
 
@@ -3979,8 +3941,8 @@ class WidgetName(Choice):
     thingPublicCategory = None # N_('Glasnost')
     thingPublicName = N_('Widget Name')
 
-    def getValues(self, slot, fields):
-        values = Choice.getValues(self, slot, fields)
+    def getValues(self, slot):
+        values = Choice.getValues(self, slot)
         if values:
             return values
         else:
diff --git a/shared/common/modes.py b/shared/common/modes.py
index b9283dba..5516a8cd 100644
--- a/shared/common/modes.py
+++ b/shared/common/modes.py
@@ -81,7 +81,7 @@ class Aspect(things.BaseThing):
         label = N_('Name')
         widget_apply = 1
 
-        def getValues(self, slot, fields):
+        def getValues(self, slot):
             card = slot.getObject()
             return card.getPropertyNames()
 
@@ -140,10 +140,10 @@ class Aspect(things.BaseThing):
         isRequired = 1
         label = N_('Widget')
 
-        def getGroupedValues(self, slot, fields):
+        def getGroupedValues(self, slot):
             return (None, None) # groupNames, groupedValues
 
-        def getValues(self, slot, fields):
+        def getValues(self, slot):
             nameSlot = slot.getContainer().getSlot(
                     'name', parentSlot = slot.parent)
             name = nameSlot.getValue()
@@ -154,7 +154,7 @@ class Aspect(things.BaseThing):
                     return kind.getPossibleWidgetNames()
             # When the property name is missing, return an empty list of
             # widgets.
-            # return self.getRealKindClass().getValues(self, slot, fields)
+            # return self.getRealKindClass().getValues(self, slot)
             return []
 
     def getOrderedFieldSlotNames(self, fields, parentSlot = None):
diff --git a/shared/common/tools.py b/shared/common/tools.py
index c9406907..789f8d50 100644
--- a/shared/common/tools.py
+++ b/shared/common/tools.py
@@ -353,36 +353,6 @@ Content-Type: application/octet-stream
         raise faults.SmtpError()
 
 
-def splitApplicationId(applicationId):
-    # FIXME: To remove and replace by commonTools.splitId, which accepts any
-    # id.
-    try:
-        assert applicationId.startswith('glasnost://')
-        splittedApplicationId = applicationId[11:].split('/', 2)
-        assert len(splittedApplicationId) == 2
-        # applicationHostNameAndPort, applicationRole = splittedApplicationId
-    except IndexError:
-        raise Exception('Malformed application id = %s' % str(applicationId))
-    except AssertionError:
-        raise Exception('Malformed application id = %s' % str(applicationId))
-    return splittedApplicationId
-
-
-def splitObjectId(id):
-    # FIXME: To remove and replace by commonTools.splitId, which accepts any
-    # id.
-    try:
-        assert id.startswith('glasnost://')
-        splittedId = id[11:].split('/', 2)
-        assert len(splittedId) == 3
-        # applicationHostNameAndPort, applicationRole, localId = splittedId
-    except IndexError:
-        raise Exception('Malformed id = %s' % str(id))
-    except AssertionError:
-        raise Exception('Malformed id = %s' % str(id))
-    return splittedId
-
-
 def utf8(s):
     """Convert a string from iso-8859-15 to utf-8."""
     if type(s) == types.UnicodeType:
diff --git a/shared/common/widgets.py b/shared/common/widgets.py
index 04d02d79..3318a282 100644
--- a/shared/common/widgets.py
+++ b/shared/common/widgets.py
@@ -166,10 +166,10 @@ class ExclusiveChoiceAbstract(BaseWidget):
     titles_kind_valueKind_valueName = 'String'
     titles_kindName = 'Mapping'
 
-    def getLabels(self, slot, fields):
+    def getLabels(self, slot):
         if self.labels:
             return self.labels
-        return slot.getKind().getLabels(slot, fields)
+        return slot.getKind().getLabels(slot)
 
 
 class Amount(BaseWidget):
@@ -256,10 +256,10 @@ class InputCheckBox(BaseWidget):
     titles_kind_valueKind_valueName = 'String'
     titles_kindName = 'Mapping'
 
-    def getLabels(self, slot, fields):
+    def getLabels(self, slot):
         if self.labels:
             return self.labels
-        return slot.getKind().getLabels(slot, fields)
+        return slot.getKind().getLabels(slot)
 register(InputCheckBox)
 
 
diff --git a/shared/common/xhtmlgenerator.py b/shared/common/xhtmlgenerator.py
index 46bdae4e..f5025384 100644
--- a/shared/common/xhtmlgenerator.py
+++ b/shared/common/xhtmlgenerator.py
@@ -239,6 +239,9 @@ class buttonStandalone:
         trueTag = a(_class = 'button', href = self.href)(text)
         return trueTag.getAsXml(**keywords)
 
+def hContext():
+    sectionLevel = context.getVar('sectionLevel')
+    return globals()['h%d' % (sectionLevel+1)]
 
 class menuIds:
     attributes = {}
diff --git a/shared/gcurses/Rubrics.py b/shared/gcurses/Rubrics.py
index bce51b28..87c890e7 100644
--- a/shared/gcurses/Rubrics.py
+++ b/shared/gcurses/Rubrics.py
@@ -94,7 +94,7 @@ class RubricsScreen(CursesScreen):
         if not hasattr(rubric, 'membersSet'):
             return
         for r in rubric.membersSet:
-            if splitObjectId(r)[1] != 'rubrics':
+            if commonTools.extractRole(r) != 'rubrics':
                 continue
             r = [ x for x in self.rubricsL if x.id == r ][0]
             self.buildHier(r, level+1)
@@ -140,7 +140,7 @@ class RubricsScreen(CursesScreen):
         statusLine = '%s  %s' % (
             currentRubric.rubric.id.ljust(width-17),
             (currentRubric.rubric.contentId and \
-             'contentId: %3d' % int(splitObjectId(currentRubric.rubric.contentId)[2]))
+             'contentId: %3d' % int(commonTools.extractLocalId(currentRubric.rubric.contentId)))
               or '')
         self.stdscr.addstr(height-1, 0, statusLine.ljust(width-1))
         
@@ -203,7 +203,8 @@ class RubricsScreen(CursesScreen):
         i = start
         if not hasattr(r, 'membersSet'):
             r.membersSet = []
-        r.membersSet = [ x for x in r.membersSet if splitObjectId(x)[1] != 'rubrics' ]
+        r.membersSet = [ x for x in r.membersSet if \
+                commonTools.extractRole(x) != 'rubrics' ]
         for r2 in self.rubrics[start:]:
             i += 1
             if r2.level == indent:
@@ -297,7 +298,7 @@ class RubricScreen(CursesScreen):
         }
         self.rubric = rubric
         self.objects = [ GlasnostObject(x) for x in rubric.membersSet \
-                            if splitObjectId(x)[1] != 'rubrics' ]
+                            if commonTools.extractRole(x) != 'rubrics' ]
 
         height, width = self.stdscr.getmaxyx()
         for i in range(1, height-3):
diff --git a/shared/gtk/kinds.py b/shared/gtk/kinds.py
index 3df07ff1..d5503b76 100644
--- a/shared/gtk/kinds.py
+++ b/shared/gtk/kinds.py
@@ -228,11 +228,6 @@ class Float(KindMixin, proxyKinds.Float):
 register(Float)
 
 
-class FunctionName(ChoiceMixin, proxyKinds.FunctionName):
-    pass
-register(FunctionName)
-
-
 class Id(IdMixin, proxyKinds.Id):
     pass
 register(Id)
diff --git a/shared/proxy/CommentsProxy.py b/shared/proxy/CommentsProxy.py
index 26689c75..4b5abf20 100644
--- a/shared/proxy/CommentsProxy.py
+++ b/shared/proxy/CommentsProxy.py
@@ -64,16 +64,26 @@ register(Comment)
 
 
 class CommentsProxy(CommentsCommonMixin, ObjectsProxy):
-    def getObjectIdsWithParent(self, parentId, serverId = None):
+    def canPostEditorialComment(self, parentId, serverId = None):
+        userToken = context.getVar('userToken', default = '')
+        serverId = self.getServerId(serverId = serverId)
+        return callServer(
+                serverId,
+                'canPostEditorialComment',
+                [serverId, getApplicationToken(), userToken, parentId])
+        
+    def getObjectIdsWithParent(self, parentId, isEditorial, serverId = None):
         userToken = context.getVar('userToken', default = '')
         serverId = self.getServerId(serverId = serverId)
         return callServer(
                 serverId,
                 'getObjectIdsWithParent',
-                [serverId, getApplicationToken(), userToken, parentId])
+                [serverId, getApplicationToken(), userToken,
+                 parentId, isEditorial])
 
-    def getObjectsWithParent(self, parentId, serverId = None):
-        objectIds = self.getObjectIdsWithParent(parentId, serverId = serverId)
+    def getObjectsWithParent(self, parentId, isEditorial, serverId = None):
+        objectIds = self.getObjectIdsWithParent(parentId, isEditorial,
+                serverId = serverId)
         multiCall = MultiCall()
         for objectId in objectIds:
             self.getObject(objectId, multiCall = multiCall)
diff --git a/shared/proxy/DispatcherProxy.py b/shared/proxy/DispatcherProxy.py
index edb6f564..9d4aae5f 100644
--- a/shared/proxy/DispatcherProxy.py
+++ b/shared/proxy/DispatcherProxy.py
@@ -748,13 +748,14 @@ def getServerAccessor(serverId):
     return serverAccessor
 
 
-def registerDispatcherId(newDispatcherId):
+def registerDispatcherId(newDispatcherId, profiles):
     userToken = context.getVar('userToken', default = '')
     dispatcherId = context.getVar('dispatcherId', default = '')
     callServer(
             dispatcherId,
             'registerDispatcherId',
-            [dispatcherId, getApplicationToken(), userToken, newDispatcherId])
+            [dispatcherId, getApplicationToken(), userToken, newDispatcherId,
+             profiles])
 
 
 def registerServer(serverHostName, serverPort):
diff --git a/shared/proxy/ObjectsProxy.py b/shared/proxy/ObjectsProxy.py
index 0e22f415..410b1b92 100644
--- a/shared/proxy/ObjectsProxy.py
+++ b/shared/proxy/ObjectsProxy.py
@@ -405,14 +405,15 @@ class AdministrableProxyMixin:
                 [serverId, getApplicationToken(), userToken, adminExport])
         return None
 
-    def newAdmin(self, fields):
+    def newAdmin(self, keywords = None):
         """Instanciate a new Admin class.
         
         Keyword argument:
         =================
 
-        *fields*:
-            Not used, if somebody knows, tell us :-).
+        *keywords*:
+            May be used in subclasses to create different objects on the basis
+            of some keyword.
         
         Exceptions:
         ===========
@@ -1598,7 +1599,7 @@ class ObjectsProxy(ObjectsCommonMixin, AdministrableProxyMixin, Proxy):
                  userToken, objectExport, givenSlotNames])
         return None
 
-    def newObject(self, fields = None):
+    def newObject(self, keywords = None):
         """Instanciate a new object.
 
         The class of the new object instance is stored in the *objectClassName*
@@ -1607,8 +1608,9 @@ class ObjectsProxy(ObjectsCommonMixin, AdministrableProxyMixin, Proxy):
         Keyword argument:
         =================
 
-        *fields*:
-            Useless.
+        *keywords*: 
+            May be used in subclasses to create different objects on the basis
+            of some keyword.
 
         Return the new object instance.
         
diff --git a/shared/proxy/VirtualHostsProxy.py b/shared/proxy/VirtualHostsProxy.py
index 46620510..acf762ef 100644
--- a/shared/proxy/VirtualHostsProxy.py
+++ b/shared/proxy/VirtualHostsProxy.py
@@ -90,9 +90,6 @@ class VirtualHostsProxy(VirtualHostsCommonMixin, ObjectsProxy):
                 'canModifyObject',
                 [serverId, getApplicationToken(), userToken, objectId])
 
-    def getObjectByHostName(self, hostName, serverId = None):
-        userToken = context.getVar('userToken', default = '')
-
     def getHostName(self, serverId):
         userToken = context.getVar('userToken', default = '')
         serverId = self.getServerId(serverId = serverId)
@@ -127,6 +124,8 @@ class VirtualHostsProxy(VirtualHostsCommonMixin, ObjectsProxy):
                 'getObjectByHostName',
                 [serverId, getApplicationToken(), userToken, utf8(hostName)])
         return commonTools.importThing(objectImport)
+        objectId = self.getObjectIdByHostName(hostName, serverId = serverId)
+        return self.getObject(objectId)
 
     def getObjectIdByHostName(self, hostName, serverId = None):
         userToken = context.getVar('userToken', default = '')
diff --git a/shared/proxy/kinds.py b/shared/proxy/kinds.py
index 1ca13350..c8ee46c2 100644
--- a/shared/proxy/kinds.py
+++ b/shared/proxy/kinds.py
@@ -219,11 +219,6 @@ class Float(KindMixin, commonKinds.Float):
 register(Float)
 
 
-class FunctionName(ChoiceMixin, commonKinds.FunctionName):
-    pass
-register(FunctionName)
-
-
 class Id(IdMixin, commonKinds.Id):
     pass
 register(Id)
diff --git a/shared/proxy/tools.py b/shared/proxy/tools.py
index 823886ae..4c58b20b 100644
--- a/shared/proxy/tools.py
+++ b/shared/proxy/tools.py
@@ -66,11 +66,11 @@ def getObjectLabelsTranslated(ids, destinationLanguages):
     while remainingIds:
         id = remainingIds[0]
         del remainingIds[0]
-        serverHostNameAndPort, serverRole, localId = splitObjectId(id)
+        serverHostNameAndPort, serverRole, localId = commonTools.splitId(id)
         proxyIds = [id]
         remainingIds2 = remainingIds[:]
         for id2 in remainingIds2:
-            serverHostNameAndPort2, serverRole2, localId2 = splitObjectId(id2)
+            serverHostNameAndPort2, serverRole2, localId2 = commonTools.splitId(id2)
             if serverHostNameAndPort2 == serverHostNameAndPort \
                and serverRole2 == serverRole:
                 proxyIds.append(id2)
@@ -170,7 +170,7 @@ def sortIds(ids):
         return []
     idsByServer = {}
     for id in ids:
-        serverHostNameAndPort, serverRole, localId = splitObjectId(id)
+        serverHostNameAndPort, serverRole, localId = commonTools.splitId(id)
         serverId = commonTools.extractServerId(id)
         if not idsByServer.has_key(serverId):
             proxy = getProxyForServerRole(serverRole)
@@ -184,7 +184,7 @@ def sortIds(ids):
     serverIds.sort()
     result = []
     for serverId in serverIds:
-        serverHostNameAndPort, serverRole = splitApplicationId(serverId)
+        serverNameAndPort, serverRole, mu = commonTools.splitId(serverId)
         proxy = getProxyForServerRole(serverRole)
         ids = idsByServer[serverId]
         sortedIds = proxy.sortObjectIds(ids, serverId = serverId, forceIds = 1)
diff --git a/shared/server/ObjectsServer.py b/shared/server/ObjectsServer.py
index baca8802..e2cd0cbf 100644
--- a/shared/server/ObjectsServer.py
+++ b/shared/server/ObjectsServer.py
@@ -89,7 +89,7 @@ class ObjectServerMixin(things.ThingMixin):
     All methods can be overriden or extended, in fact, this class define their
     default behavior.
     
-    The client that want to operate on the object is usualy a other server.
+    The client that want to operate on the object is usually a other server.
     """
     
     id_kind_isAutomaticallyModified = 1
@@ -108,7 +108,7 @@ class ObjectServerMixin(things.ThingMixin):
         """Load the data associated with the object.
        
         The datas are loaded, but the metadata are in the object instance.
-        The datas are usualy big things like files, text, etc...
+        The datas are usually big things like files, text, etc...
         
         Keyword arguments:
         ==================
@@ -135,8 +135,8 @@ class ObjectServerMixin(things.ThingMixin):
                 dataDirectoryPath = virtualServer.dataDirectoryPath
             objectsDirectoryPath = os.path.join(
                 dataDirectoryPath, server.applicationRole)
-            serverHostNameAndPort, serverRole, localId = splitObjectId(
-                self.id)
+            serverHostNameAndPort, serverRole, localId = \
+                    commonTools.splitId(self.id)
             objectDirectoryPath = os.path.join(
                 objectsDirectoryPath, localId)
         things.ThingMixin.acquireNonCore(
@@ -145,10 +145,7 @@ class ObjectServerMixin(things.ThingMixin):
     def canBeCreatedByClient(self):
         """Indicate whether the client application can create an object."""
 
-        clientToken = context.getVar('clientToken')
-        clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
-        return clientRole == 'workflows'
+        return 0
 
     def canBeDeletedByClient(self):
         """Indicate whether the client application can delete the object."""
@@ -158,10 +155,7 @@ class ObjectServerMixin(things.ThingMixin):
     def canBeGottenByClient(self):
         """Indicate whether the client application can get the object."""
         
-        clientToken = context.getVar('clientToken')
-        clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
-        return clientRole == 'workflows'
+        return 0
 
     def canBeModified(self):
         """Indicate whether the object can be modified."""
@@ -171,10 +165,7 @@ class ObjectServerMixin(things.ThingMixin):
     def canBeModifiedByClient(self):
         """Indicate whether the client application can modify the object."""
         
-        clientToken = context.getVar('clientToken')
-        clientId = getApplicationId(clientToken)
-        clientNameAndPort, clientRole = splitApplicationId(clientId)
-        return clientRole == 'workflows'
+        return 0
 
     def checkAddIsPossible(self):
         """Indicate whether the object can be added to the server dictionnary.
@@ -319,7 +310,7 @@ class ObjectServerMixin(things.ThingMixin):
                       dataDirectoryPath = None, parentSlot = None):
         """Remove the object datas from memory.
 
-        The datas are usualy big things like files, text, etc...
+        The datas are usually big things like files, text, etc...
         
         Keyword arguments:
         ==================
@@ -350,7 +341,8 @@ class ObjectServerMixin(things.ThingMixin):
                 dataDirectoryPath, server.applicationRole)
             if not os.access(objectsDirectoryPath, os.F_OK):
                 return
-            serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+            serverHostNameAndPort, serverRole, localId = \
+                    commonTools.splitId(self.id)
             objectDirectoryPath = os.path.join(objectsDirectoryPath, localId)
         if not os.access(objectDirectoryPath, os.F_OK):
             return
@@ -364,7 +356,7 @@ class ObjectServerMixin(things.ThingMixin):
                     parentSlot = None):
         """Save the object datas.
 
-        The datas are usualy big things like files, text, etc...
+        The datas are usually big things like files, text, etc...
         
         Keyword arguments:
         ==================
@@ -399,7 +391,8 @@ class ObjectServerMixin(things.ThingMixin):
             if not os.access(objectsDirectoryPath, os.F_OK):
                 os.mkdir(objectsDirectoryPath)
                 os.chmod(objectsDirectoryPath, 0750)
-            serverHostNameAndPort, serverRole, localId = splitObjectId(self.id)
+            serverHostNameAndPort, serverRole, localId = \
+                    commonTools.splitId(self.id)
             objectDirectoryPath = os.path.join(objectsDirectoryPath, localId)
             if os.access(objectDirectoryPath, os.F_OK):
                 try:
@@ -739,7 +732,6 @@ class Server(things.BaseThing, applications.Application):
     hasMultipleVirtualServers = 1
     hostName = None
     isThreaded = 1
-    onlyForDispatcherIds = None
     port = None
     rpcServer = None
     thingCategory = 'server'
@@ -756,12 +748,14 @@ class Server(things.BaseThing, applications.Application):
         # TODO: check on clientToken (only dispatcher we registered to should
         # be allowed)
 
-        if self.hasMultipleVirtualServers and self.onlyForDispatcherIds \
-               and not newDispatcherId in self.onlyForDispatcherIds:
-            return
-
         newVirtualServerId = commonTools.makeApplicationId(
                 newDispatcherId, self.applicationRole)
+        
+        try:
+            registerVirtualServer(self.hostName, self.port, newVirtualServerId)
+        except faults.RoleNotInProfiles:
+            return
+
         if self.hasMultipleVirtualServers:
             self.virtualServers[newVirtualServerId] = self.loadVirtualServer(
                     newVirtualServerId)
@@ -771,7 +765,6 @@ class Server(things.BaseThing, applications.Application):
         context.getVar('applicationTokens')[newVirtualServerId] = \
                 getApplicationToken()
         context.pull()
-        registerVirtualServer(self.hostName, self.port, newVirtualServerId)
 
     def canGetAdmin(self):
         """Indicate whether the caller is able to get the admin instance.
@@ -1125,14 +1118,6 @@ class Server(things.BaseThing, applications.Application):
             if self.port is not None:
                 del self.port
 
-        onlyForDispatcherIds = commonTools.getConfig(
-                self.applicationName, 'OnlyForDispatchers')
-        if onlyForDispatcherIds:
-            self.onlyForDispatcherIds = onlyForDispatcherIds.replace(
-                    ',', ' ').split()
-        elif self.onlyForDispatcherIds is not None:
-            del self.onlyForDispatcherIds
-
         if self.useDataFile:
             self.dataDirectoryPath = commonTools.getConfig(
                     'Misc', 'DataDirectoryPath')
@@ -1317,14 +1302,14 @@ class Server(things.BaseThing, applications.Application):
 
         # Register each virtual server to the dispatcher.
         if self.hasMultipleVirtualServers:
-            if self.onlyForDispatcherIds:
-                dispatcherIds = [
-                        dispatcherId
-                        for dispatcherId in self.onlyForDispatcherIds
-                        if dispatcherId and dispatcherId in dispatcherIds]
             for dispatcherId in dispatcherIds:
                 virtualServerId = commonTools.makeApplicationId(
                         dispatcherId, self.applicationRole)
+                try:
+                    registerVirtualServer(
+                            self.hostName, self.port, virtualServerId)
+                except faults.RoleNotInProfiles:
+                    continue
                 self.virtualServers[virtualServerId] = self.loadVirtualServer(
                         virtualServerId)
                 context.push(
@@ -1333,8 +1318,6 @@ class Server(things.BaseThing, applications.Application):
                 context.getVar('applicationTokens')[virtualServerId] = \
                         getApplicationToken()
                 context.pull()
-                registerVirtualServer(
-                        self.hostName, self.port, virtualServerId)
 
     def removeIdsFromVirtualServer(self, dispatcherId, rolesToKeep):
         virtualServerId = commonTools.makeApplicationId(
diff --git a/shared/server/kinds.py b/shared/server/kinds.py
index fd6735f1..09c3498d 100644
--- a/shared/server/kinds.py
+++ b/shared/server/kinds.py
@@ -277,11 +277,6 @@ class Float(KindMixin, commonKinds.Float):
 register(Float)
 
 
-class FunctionName(ChoiceMixin, commonKinds.FunctionName):
-    pass
-register(FunctionName)
-
-
 class Id(IdMixin, commonKinds.Id):
     pass
 register(Id)
diff --git a/shared/web/AppointmentsWeb.py b/shared/web/AppointmentsWeb.py
index 80b823b8..3029722b 100644
--- a/shared/web/AppointmentsWeb.py
+++ b/shared/web/AppointmentsWeb.py
@@ -47,6 +47,8 @@ __version__ = '$Revision$'[11:-2]
 import calendar
 import time
 
+import glasnost.common.tools_new as commonTools
+
 from glasnost.proxy.AppointmentsProxy import *
 from ObjectsWeb import register, AdminMixin, ObjectWebMixin, ObjectsWebMixin
 
@@ -77,7 +79,7 @@ class Appointment(ObjectWebMixin, Appointment):
         stateInEditMode = 'read-write'
         class itemKind_valueClass:
             _kindName = 'Id'
-            def getValues(self, slot, fields):
+            def getValues(self, slot):
                 admin = slot.getObject().getWeb().getAdmin()
                 groupsProxy = getProxyForServerRole('groups')
                 if not admin.categoriesGroupId:
@@ -624,7 +626,7 @@ class AppointmentsWeb(ObjectsWebMixin, AppointmentsProxy):
                     for d in dayAppointments:
                         hasDetails = 0
                         li = X.li()
-                        disp, role, id = splitObjectId(d.id)
+                        disp, role, id = commonTools.splitId(d.id)
                         idAttribute = 'appointment-%s-%s' % (disp, id)
                         li += X.a(href = X.idUrl(d.id), id = idAttribute)(
                                 d.getLabelTranslated(withHour = 1))
diff --git a/shared/web/AuthenticationLoginPasswordWeb.py b/shared/web/AuthenticationLoginPasswordWeb.py
index 565ea5f5..34f622f1 100644
--- a/shared/web/AuthenticationLoginPasswordWeb.py
+++ b/shared/web/AuthenticationLoginPasswordWeb.py
@@ -537,7 +537,7 @@ correctly configured.\
         if not usercardWeb.canAddObject():
             return accessForbidden()
         
-        userCardObject = usercardWeb.newObject(None)
+        userCardObject = usercardWeb.newObject()
         authObject = self.newAuthenticationObject()
 
         return self.newAccountObject(userCardObject, authObject)
@@ -583,7 +583,7 @@ correctly configured.\
         if not usercardWeb.canAddObject():
             return accessForbidden()
         
-        userCardObject = usercardWeb.newObject(fields = None)
+        userCardObject = usercardWeb.newObject()
         userCardSlot = slots.Root(userCardObject, name = 'userCard')
         userCardObject.submitFields(keywords, parentSlot = userCardSlot)
         if userCardObject.id:
diff --git a/shared/web/CommentsWeb.py b/shared/web/CommentsWeb.py
index 44df4155..0dd9c18a 100644
--- a/shared/web/CommentsWeb.py
+++ b/shared/web/CommentsWeb.py
@@ -66,10 +66,6 @@ class Comment(ObjectWebMixin, Comment):
     body_kind_widget_rows = 20
     body_kind_widgetName = 'TextArea'
 
-    title_kind_widget_fieldLabel = N_('Title')
-    title_kind_widget_size = 40
-    title_kind_widgetName = 'InputText'
-
     def getEditLayoutSlotNames(self, fields, parentSlot = None):
         slotNames = ObjectWebMixin.getEditLayoutSlotNames(self, fields,
                 parentSlot = parentSlot) [:]
@@ -79,23 +75,28 @@ class Comment(ObjectWebMixin, Comment):
             slotNames.remove('parentId')
         if 'creationTime' in slotNames:
             slotNames.remove('creationTime')
+        if 'isEditorial' in slotNames:
+            if not self.getWeb().canPostEditorialComment(self.parentId):
+                slotNames.remove('isEditorial')
+            pass
+
         return slotNames
 
     def getViewLayoutSlotNames(self, fields, parentSlot = None):
-        return ['title', 'body']
+        return ['authorId', 'creationTime', 'body']
 
     def getViewLayout(self, fields, parentSlot = None):
         sectionLevel = context.getVar('sectionLevel')
         context.push(sectionLevel = sectionLevel+1)
 
         layout = X.array()
-        titleSlot = self.getSlot('title')
-        titleHtml = titleSlot.getWidget().getHtmlValue(titleSlot, fields)
-        titleTag = getattr(X, 'h%s' % (sectionLevel+1))
-        if len(titleHtml.children) == 2:
-            # remove translation bar
-            del titleHtml.children[1]
-        layout += titleTag(titleHtml)
+        #titleSlot = self.getSlot('title')
+        #titleHtml = titleSlot.getWidget().getHtmlValue(titleSlot, fields)
+        #titleTag = getattr(X, 'h%s' % (sectionLevel+1))
+        #if len(titleHtml.children) == 2:
+        #    # remove translation bar
+        #    del titleHtml.children[1]
+        #layout += titleTag(titleHtml)
 
         authorIdSlot = self.getSlot('authorId')
         if authorIdSlot.getValue():
@@ -130,6 +131,46 @@ class CommentsWeb(ObjectsWebMixin, CommentsProxy):
     def use(self): pass
     def view(self): pass
 
+    def getCommentsLayout(self, parentId, isEditorial = 0):
+        comments = self.getObjectsWithParent(parentId, isEditorial).values()
+        comments.sort(lambda x,y: cmp(x.creationTime, y.creationTime))
+        layout = X.array()
+        if len(comments) == 0:
+            #layout += X.p(_('No comment.'))
+            return None
+        for i, comment in zip(range(len(comments)), comments):
+            layout += X.div(_class = 'comment', id = 'comment-%d' % (i+i))(
+                    X.span(_class = 'comment-no')(str(i+1)),
+                    comment.getViewLayout(self, None))
+        return layout
+
+    def getBothCommentsLayout(self, parentId):
+        layout = X.array()
+
+        if self.canPostEditorialComment(parentId):
+            context.push(sectionLevel = context.getVar('sectionLevel') + 1)
+            comments = self.getCommentsLayout(parentId, isEditorial = 1)
+            context.pull()
+            if comments is not None:
+                layout += X.hContext()(
+                        id = 'editorial-comments')(_('Editorial Comments'))
+                layout += comments
+
+        context.push(sectionLevel = context.getVar('sectionLevel') + 1)
+        comments = self.getCommentsLayout(parentId)
+        context.pull()
+        if comments is not None:
+            layout += X.hContext()(id = 'comments')(_('Comments'))
+            layout += comments
+
+        if self.canAddObject():
+            layout += X.div(_class = 'buttons-bar')(
+                    X.buttonStandalone(_('Add Comment'),
+                            X.idUrl(parentId, 'addComment')))
+
+        return layout
+
+
     def viewAll(self):
         layout = X.array()
         userToken = context.getVar('userToken')
diff --git a/shared/web/ElectionsWeb.py b/shared/web/ElectionsWeb.py
index 8743e416..e49f96bf 100644
--- a/shared/web/ElectionsWeb.py
+++ b/shared/web/ElectionsWeb.py
@@ -770,9 +770,9 @@ class ElectionsWeb(ObjectsWebMixin, ElectionsProxy):
         return OK
     graphPie.isPublicForWeb = 1
 
-    def newObject(self, fields = None):
-        if fields and fields.has_key('method') and \
-                fields['method'] == 'average':
+    def newObject(self, keywords = None):
+        if keywords and keywords.has_key('method') and \
+                keywords['method'] == 'average':
             object = ElectionAverage()
         else:
             object = ElectionCondorcet()
diff --git a/shared/web/GroupsWeb.py b/shared/web/GroupsWeb.py
index 1c3c10f3..4ab31e7b 100644
--- a/shared/web/GroupsWeb.py
+++ b/shared/web/GroupsWeb.py
@@ -176,13 +176,13 @@ class GroupsWeb(objects.ObjectsWebMixin, proxyGroups.GroupsProxy):
                 object.itemIds = _('Illegal recursive group')
         return object
 
-    def newObject(self, fields = None):
+    def newObject(self, keywords = None):
         group = GroupUnion() # fake group to get className
-        if not fields:
+        if not keywords:
             group.className = 'GroupUnion'
             return group
         classNameSlot = group.getSlot('className')
-        className = classNameSlot.getWidget().submit(classNameSlot, fields)
+        className = classNameSlot.getWidget().submit(classNameSlot, keywords)
         if not className:
             className = 'GroupUnion'
         group = commonTools.newThing('object', 'groups.%s' % className)
diff --git a/shared/web/ObjectsWeb.py b/shared/web/ObjectsWeb.py
index 22214a9f..382d9fce 100644
--- a/shared/web/ObjectsWeb.py
+++ b/shared/web/ObjectsWeb.py
@@ -302,7 +302,7 @@ class ObjectsWebMixin(AdministrableWebMixin):
             return pageNotFound()
     delete.isPublicForWeb = 1
 
-    def download(self, id, path):
+    def download(self, id, filename = '', path = 'self'):
         localId = commonTools.extractLocalId(id)
         if localId == '__admin__':
             if not self.canGetAdmin():
@@ -324,6 +324,10 @@ class ObjectsWebMixin(AdministrableWebMixin):
         dataFileName = upload.getSlot(
             'dataFileName', parentSlot = uploadSlot).getValue()
         if dataFileName:
+            if not filename:
+                uri = X.idUrl(id, 'download/%s' % dataFileName).add(
+                        'path', path)
+                return redirect(uri)
             req.headers_out['Content-Disposition'] = \
                 'inline; filename="%s"' % dataFileName
         req.headers_out['Content-Length'] = str(len(data))
@@ -611,6 +615,10 @@ class ObjectsWebMixin(AdministrableWebMixin):
         return None
 
     def getViewBelowButtonsBarLayout(self, object, fields):
+        if hasattr(self, 'addComment') and \
+                'comments' in context.getVar('knownRoles'):
+            return getWebForServerRole(
+                    'comments').getBothCommentsLayout(object.id)
         return None
 
     def getViewButtonsBarLayout(self, object, fields):
@@ -1143,6 +1151,7 @@ class CommentableObjectMixin(things.ThingMixin):
 
     def addCommentObject(self, id, object):
         webRole = getWebForServerRole('comments')
+        object.parentId = id
         context.push(_level = 'edit', layoutMode = 'edit')
         try:
             layout = X.array()
@@ -1182,56 +1191,6 @@ class CommentableObjectMixin(things.ThingMixin):
             if context.getVar('debug'):
                 raise
             return accessForbidden()
-        return redirect(X.idUrl(id, 'withComments'))
+        return redirect(X.idUrl(id))
     addCommentSubmit.isPublicForWeb = 1
 
-    def commentsLayout(self, id):
-        commentsWeb = getWebForServerRole('comments')
-        comments = commentsWeb.getObjectsWithParent(id).values()
-        comments.sort(lambda x,y: cmp(x.creationTime, y.creationTime))
-        layout = X.array()
-        if len(comments) == 0:
-            layout += X.p(_('No comment.'))
-        for i, comment in zip(range(len(comments)), comments):
-            layout += X.div(_class = 'comment', id = 'comment-%d' % (i+i))(
-                    X.span(_class = 'comment-no')(str(i+1)),
-                    comment.getViewLayout(self, None))
-        if self.canAddObject():
-            layout += X.div(_class = 'buttons-bar')(
-                    X.buttonStandalone('add', X.idUrl(id, 'addComment')))
-        return layout
-
-    def comments(self, id):
-        layout = self.commentsLayout(id)
-        return writePageLayout(layout, _('Comments'))
-    comments.isPublicForWeb = 1
-
-    def withComments(self, id):
-        object = self.getObject(id)
-        rememberObject(id)
-
-        label = object.getLabelTranslated(context.getVar('readLanguages'))
-
-        layout = X.array()
-        slot = slots.Root(object)
-        widget = slot.getWidget()
-        layout += widget.getModelPageBodyLayout(slot, {})
-        layout += self.getViewButtonsBarLayout(object, None)
-        pageTitle = context.getVar('pageTitle', default = None)
-
-        layout += X.h2(id = 'comments')(_('Comments'))
-        context.push(sectionLevel = context.getVar('sectionLevel') + 1)
-        layout += self.commentsLayout(id)
-        context.pull()
-
-        context.push(
-            currentObject = WebAPI.GlasnostObject(object = object),
-            )
-        if not pageTitle:
-            pageTitle = '%s - %s' % (_(self.objectNameCapitalized), label)
-        layout = writePageLayout(layout, pageTitle)
-        context.pull()
-        return layout
-    withComments.isPublicForWeb = 1
-
-
diff --git a/shared/web/UploadFilesWeb.py b/shared/web/UploadFilesWeb.py
index 6b92fdf8..10bbd5aa 100644
--- a/shared/web/UploadFilesWeb.py
+++ b/shared/web/UploadFilesWeb.py
@@ -205,6 +205,9 @@ class UploadFilesWeb(ObjectsWebMixin, UploadFilesProxy):
 
         if fileName and object.dataFileName != fileName:
             pageNotFound()
+        if not fileName and object.dataFileName:
+            uri = X.idUrl(id, 'download/%s' % object.dataFileName)
+            return redirect(uri)
 
         req = context.getVar('req')
         req.depends.append(id)
diff --git a/shared/web/WebAPI.py b/shared/web/WebAPI.py
index 948a8c77..59b38370 100644
--- a/shared/web/WebAPI.py
+++ b/shared/web/WebAPI.py
@@ -135,7 +135,7 @@ class GlasnostObject:
         else:
             raise "You should give an id or an object!"
         try:
-            self.serverRole = tools.splitObjectId(self.objectId)[1]
+            self.serverRole = commonTools.extractRole(self.objectId)
         except IndexError:
             pass
         except:
@@ -346,7 +346,7 @@ def _getPathToObject(object, source):
     if object in source.membersSet:
         return [source]
     for m in source.membersSet:
-        if tools.splitObjectId(m.objectId)[1] != 'rubrics':
+        if commonTools.extractRole(m.objectId) != 'rubrics':
             # we don't go through getSetContainedIds here
             continue
         t = _getPathToObject(object, m)
@@ -369,7 +369,7 @@ def getPathToObject(object):
 def getTree(source, done = None, level=5):
     if done is None:
         done = []
-    if tools.splitObjectId(source.objectId)[1] != 'rubrics' or \
+    if commonTools.extractRole(source.objectId) != 'rubrics' or \
             level == 0 or source in done:
         return (source, [])
     try:
diff --git a/shared/web/kinds.py b/shared/web/kinds.py
index cf666e88..5e8c176a 100644
--- a/shared/web/kinds.py
+++ b/shared/web/kinds.py
@@ -199,8 +199,7 @@ class ThingMixin(ChoiceMixin):
 
     def makeModelTitleFromValue(self, slot, fields, value):
         object = slot.getObject()
-        label = _(self.getLabels(slot, fields)[
-                self.getModelValueAsString(value)])
+        label = _(self.getLabels(slot)[self.getModelValueAsString(value)])
         return object.makeContentTitle(slot, label)
 
     def newModelWidget(self, slot):
@@ -350,11 +349,6 @@ class Float(KindMixin, proxyKinds.Float):
 register(Float)
 
 
-class FunctionName(ChoiceMixin, proxyKinds.FunctionName):
-    pass
-register(FunctionName)
-
-
 class Id(IdMixin, proxyKinds.Id):
     pass
 register(Id)
@@ -397,8 +391,7 @@ class KindName(ChoiceMixin, proxyKinds.KindName):
 
     def makeModelTitleFromValue(self, slot, fields, value):
         object = slot.getObject()
-        label = _(self.getLabels(slot, fields)[
-                self.getModelValueAsString(value)])
+        label = _(self.getLabels(slot)[self.getModelValueAsString(value)])
         return object.makeContentTitle(slot, label)
 register(KindName)
 
@@ -656,8 +649,7 @@ class WidgetName(ChoiceMixin, proxyKinds.WidgetName):
 
     def makeModelTitleFromValue(self, slot, fields, value):
         object = slot.getObject()
-        label = _(self.getLabels(slot, fields)[
-                self.getModelValueAsString(value)])
+        label = _(self.getLabels(slot)[self.getModelValueAsString(value)])
         return object.makeContentTitle(slot, label)
 register(WidgetName)
 
diff --git a/shared/web/tools.py b/shared/web/tools.py
index 87639e2c..ea73c977 100644
--- a/shared/web/tools.py
+++ b/shared/web/tools.py
@@ -270,10 +270,10 @@ def getWebForServerRole(serverRole):
             not serverRole in context.getVar('knownRoles'):
         return None
 
-    if context.getVar('virtualHost'):
-        serverRoleWeb = commonTools.getConfig(
-                context.getVar('virtualHost').hostName,
-                serverRole + '-web', default = serverRole)
+    virtualHost = context.getVar('virtualHost')
+    if virtualHost is not None and virtualHost.customWebs and \
+            serverRole in virtualHost.customWebs.keys():
+        serverRoleWeb = virtualHost.customWebs[serverRole].lower()
     else:
         serverRoleWeb = serverRole
     serverRoleWeb = serverRoleWeb.replace('-', '')
@@ -718,7 +718,7 @@ def writePageLayout(layout, title, canCache = 1):
 
 def getAppropriateTalFile(serverRole, idValue, action):
     if idValue:
-        id = splitObjectId(idValue)
+        id = commonTools.splitId(idValue)
         serverRole = id[1]
         fileNames = (
             '%s-%s.%s.%s.tal' % (serverRole, id[0], id[2], action),
@@ -766,7 +766,7 @@ def getAppropriateTalFile(serverRole, idValue, action):
 
 def getAppropriatePyFile(serverRole, idValue, action):
     if idValue:
-        id = splitObjectId(idValue)
+        id = commonTools.splitId(idValue)
         serverRole = id[1]
         fileNames = (
             '%s-%s.%s.%s.py' % (serverRole, id[0], id[2], action),
diff --git a/shared/web/widgets.py b/shared/web/widgets.py
index a1c8885c..5cd6000e 100644
--- a/shared/web/widgets.py
+++ b/shared/web/widgets.py
@@ -282,7 +282,7 @@ class ExclusiveChoiceMixin(WidgetMixin):
         kind = slot.getKind()
         value = slot.getValue() or ''
         valueAsString = kind.getModelValueAsString(value)
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
         if labels.has_key(valueAsString):
             return self.makeModelTitleFromValue(slot, fields, value)
         elif value == '__all__':
@@ -300,7 +300,7 @@ class ExclusiveChoiceMixin(WidgetMixin):
             title = kind.makeModelTitleFromValue(slot, fields, value)
             if title:
                 return title
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
         if labels and labels.has_key(valueAsString):
             return _(labels[valueAsString])
         return None
@@ -814,13 +814,13 @@ class InputCheckBox(WidgetMixin, proxyWidgets.InputCheckBox):
         inputAttributes = {}
         if value:
             inputAttributes['checked'] = 'checked'
-        trueValue = kind.getValues(slot, fields)[1]
+        trueValue = kind.getValues(slot)[1]
         layout += X.input(
                 _class = 'checkbox', name = fieldName, type = 'checkbox',
                 value = kind.getModelValueAsString(trueValue),
                 **inputAttributes)
         layout += X.nbsp
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
         label = labels[kind.getModelValueAsString(trueValue)]
         layout += _(label)
         if self.apply:
@@ -838,7 +838,7 @@ class InputCheckBox(WidgetMixin, proxyWidgets.InputCheckBox):
             title = kind.makeModelTitleFromValue(slot, fields, value)
             if title:
                 return title
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
         if labels and labels.has_key(valueAsString):
             return _(labels[valueAsString])
         return None
@@ -1191,7 +1191,7 @@ class MultiCheck(WidgetMixin, proxyWidgets.MultiCheck):
     def getHtmlViewValue(self, slot, fields, **keywords):
         kind = slot.getKind()
         layout = X.ul()
-        value = slot.getValue()
+        value = slot.getValue() or []
         for i, v in zip(range(len(value)), value):
             itemSlot = kind.getItemSlot(slot, i)
             itemWidget = itemSlot.getWidget()
@@ -1201,8 +1201,8 @@ class MultiCheck(WidgetMixin, proxyWidgets.MultiCheck):
     def getHtmlFormValue(self, slot, fields, **keywords):
         kind = slot.getKind()
         layout = X.ul()
-        values = kind.itemKind.getValues(slot, fields)
-        labels = kind.itemKind.getLabels(slot, fields)
+        values = kind.itemKind.getSortedValues(slot)
+        labels = kind.itemKind.getLabels(slot)
         for i in range(len(values)):
             itemSlot = kind.getItemSlot(slot, i)
             itemWidget = itemSlot.getWidget()
@@ -1212,13 +1212,13 @@ class MultiCheck(WidgetMixin, proxyWidgets.MultiCheck):
                 attrs = {'checked': 'checked'}
             layout += X.li(
                     X.input(type = 'checkbox', name = fieldName, **attrs),
-                    labels[values[i]])
+                    _(labels[values[i]]))
         return layout
 
     def submit(self, slot, fields):
         kind = slot.getKind()
         value = []
-        values = kind.itemKind.getValues(slot, fields)
+        values = kind.itemKind.getValues(slot)
         for i in range(len(values)):
             fieldName = slot.getFieldOptionName(values[i])
             itemValue = slot.getFieldOption(fields, values[i])
@@ -1291,13 +1291,13 @@ class RadioButtons(ExclusiveChoiceMixin, proxyWidgets.RadioButtons):
                 valueAsString = ''
 
         if hasattr(kind, 'sortLabels') and kind.sortLabels:
-            values = kind.getSortedValues(slot, fields)
+            values = kind.getSortedValues(slot)
         else:
-            values = kind.getValues(slot, fields)
+            values = kind.getValues(slot)
         if values is None:
             raise Exception('Kind "%s" of slot "%s" has no values' % (
                     kind, slot))
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
 
         layout = X.array()
         layout += self.getModelErrorLayout(slot, fields)
@@ -1381,13 +1381,13 @@ class Select(ExclusiveChoiceMixin, proxyWidgets.Select):
                 valueAsString = ''
 
         if hasattr(kind, 'sortLabels') and kind.sortLabels:
-            values = kind.getSortedValues(slot, fields)
+            values = kind.getSortedValues(slot)
         else:
-            values = kind.getValues(slot, fields)
+            values = kind.getValues(slot)
         if values is None:
             raise Exception('Kind "%s" of slot "%s" has no values' % (
                     kind, slot))
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
 
         layout = X.array()
         layout += self.getModelErrorLayout(slot, fields)
@@ -1419,7 +1419,7 @@ class Select(ExclusiveChoiceMixin, proxyWidgets.Select):
         layout += self.getModelHelpLayout(slot, fields)
         groupNames = None
         if hasattr(kind, 'getGroupedValues'):
-            groupNames, groupedValues = kind.getGroupedValues(slot, fields)
+            groupNames, groupedValues = kind.getGroupedValues(slot)
         if groupNames is not None:
             for groupName in groupNames:
                 groupValues = groupedValues[groupName]
@@ -1492,9 +1492,9 @@ class SelectId(WidgetMixin, proxyWidgets.SelectId):
 
         showOthersButton = self.showOthersButton
 
-        values = kind.getValues(slot, fields)
+        values = kind.getValues(slot)
         for serverRole in serverRoles:
-            ids = [x for x in values if splitObjectId(x)[1] == serverRole]
+            ids = [x for x in values if commonTools.extractRole(x) == serverRole]
             if not ids:
                 continue
             menus[serverRole] = getObjectLabelsTranslated(
@@ -1820,6 +1820,9 @@ class UploadFile(WidgetMixin, proxyWidgets.UploadFile):
         if value.value:
             upload.data = value.value
             upload.dataFileName = value.filename
+            if '\\' in upload.dataFileName:
+                upload.dataFileName = upload.dataFileName[
+                        upload.dataFileName.rindex('\\')+1:]
             upload.dataType = value.type
         else:
             data = sessionsProxy.getTemporaryData(dataToken)
@@ -1899,10 +1902,10 @@ class XSelect(Select, proxyWidgets.XSelect):
         otherFieldValue = slot.getFieldOption(fields, 'other', default = '')
         kind = slot.getKind()
         if kind.sortLabels:
-            values = kind.getSortedValues(slot, fields)
+            values = kind.getSortedValues(slot)
         else:
-            values = kind.getValues(slot, fields)
-        groupNames, groupedValues = kind.getGroupedValues(slot, fields)
+            values = kind.getValues(slot)
+        groupNames, groupedValues = kind.getGroupedValues(slot)
         if values is None:
             raise Exception('Kind "%s" of slot "%s" has no values' % (
                     kind, slot))
@@ -1912,7 +1915,7 @@ class XSelect(Select, proxyWidgets.XSelect):
                 fieldValue = ''
             else:
                 fieldValue = str(fieldValue)
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
 
         if not self.isInForm():
             if labels.has_key(str(fieldValue)):
@@ -1951,7 +1954,7 @@ class XSelect(Select, proxyWidgets.XSelect):
                         noneLabel)
             groupNames = None
             if hasattr(kind, 'getGroupedValues'):
-                groupNames, groupedValues = kind.getGroupedValues(slot, fields)
+                groupNames, groupedValues = kind.getGroupedValues(slot)
             if groupNames is not None:
                 for groupName in groupNames:
                     groupValues = groupedValues[groupName]
@@ -2036,7 +2039,7 @@ class XSelect(Select, proxyWidgets.XSelect):
             title = kind.makeModelTitleFromValue(slot, fields, value)
             if title:
                 return title
-        labels = self.getLabels(slot, fields)
+        labels = self.getLabels(slot)
         if labels and labels.has_key(valueAsString):
             return _(labels[valueAsString])
         return valueAsString
diff --git a/templates/entrouvert.be/StandardLookAndFeel.html b/templates/entrouvert.be/StandardLookAndFeel.html
index fa237b92..01498ff1 100644
--- a/templates/entrouvert.be/StandardLookAndFeel.html
+++ b/templates/entrouvert.be/StandardLookAndFeel.html
@@ -26,7 +26,7 @@
 			</div>
 			-->
 			<h1><a href="/" tal:reroot="href"><img tal:reroot="src" src="/images/logo-entrouvert.be.png" alt="entrouvert.be" /></a>
-			<span tal:condition="virtualHost.hostName[0] != '*'" tal:content="str(virtualHost)">title</span>
+			<span tal:condition="virtualHost.hostName[0] != 'entrouvert.be'" tal:content="str(virtualHost)">title</span>
 			</h1>
 		</div>
 
diff --git a/templates/glasnost.entrouvert.org/web/css/glasnost.css b/templates/glasnost.entrouvert.org/web/css/glasnost.css
index b61f870b..c2ed439c 100644
--- a/templates/glasnost.entrouvert.org/web/css/glasnost.css
+++ b/templates/glasnost.entrouvert.org/web/css/glasnost.css
@@ -118,8 +118,9 @@ ul.article-meta {
 	max-width: 15em;
 }
 
-ul.article-meta li {
+div#main-content ul.article-meta li {
 	padding: 0 0.3em;
+	margin: 0;
 }
 
 div#main-content h1, div#main-content h2.title {
diff --git a/templates/watercolor/web/css/watercolor.css b/templates/watercolor/web/css/watercolor.css
index c644f5ff..367b7d4e 100644
--- a/templates/watercolor/web/css/watercolor.css
+++ b/templates/watercolor/web/css/watercolor.css
@@ -273,3 +273,10 @@ td.translation-ok, td.translation-missing {
 	text-align: center;
 }
 
+div.spip-notes {
+	margin-top: 1em;
+	border-top: 1px solid #44618f;
+	font-size: 90%;
+}
+
+	
diff --git a/templates/www.entrouvert.com/.cvsignore b/templates/www.entrouvert.com/.cvsignore
new file mode 100644
index 00000000..68b83b97
--- /dev/null
+++ b/templates/www.entrouvert.com/.cvsignore
@@ -0,0 +1,4 @@
+*.htmlc.*
+*.talc.*
+infos.xml
+infos.xml.in.h
diff --git a/tests/SpipTests.py b/tests/SpipTests.py
index 2ba15341..d85db3c8 100644
--- a/tests/SpipTests.py
+++ b/tests/SpipTests.py
@@ -6,9 +6,13 @@ import unittest
 glasnostPythonDir = '/usr/local/lib/glasnost-tests'
 sys.path.insert(0, glasnostPythonDir)
 
+import glasnost.common.context as context
 from glasnost.common.parsers import makeHtmlFromSpip
 
 class SpipParserTestCase(unittest.TestCase):
+    def setUp(self):
+        context.push(dispatcherId = 'glasnost://localhost')
+
     def test00_plainSentence(self):
         '''Render a plain sentence'''
         result = makeHtmlFromSpip('''this is not interesting''')
@@ -37,12 +41,12 @@ class SpipParserTestCase(unittest.TestCase):
     def test05_glasnostLink(self):
         '''Render a link to a Glasnost article'''
         result = makeHtmlFromSpip('''[->article 2]''', inline = 1)
-        self.failUnless(result == '<a href="[{glasnost:partialid:articles:2}]">[{glasnost:label:articles:2}]</a>')
+        self.failUnless(result == '<a href="[{glasnost:partialid:localhost:articles:2}]">[{glasnost:label:localhost:articles:2}]</a>')
 
     def test06_glasnostPageNameLink(self):
         '''Render a link using an alias'''
         result = makeHtmlFromSpip('''[->alias test]''', inline = 1)
-        self.failUnless(result == '<a href="[{glasnost:alias:test}]">[{glasnost:aliaslabel:test}]</a>')
+        self.failUnless(result == '<a href="[{glasnost:alias:localhost:test}]">[{glasnost:aliaslabel:localhost:test}]</a>')
 
     def test07_nothingSpecialLink(self):
         '''Render a plain link, nothing special'''
diff --git a/tests/WebTests.py b/tests/WebTests.py
index 8813a0d4..84ca8d91 100644
--- a/tests/WebTests.py
+++ b/tests/WebTests.py
@@ -84,6 +84,10 @@ class ParserForForms(sgmllib.SGMLParser):
         if attrs.has_key('type') and attrs['type'] == 'submit':
             self.currentForm.buttons.append( (attrs['name'], attrs['value']) )
             return
+        if attrs.has_key('type') and attrs['type'] == 'checkbox':
+            if attrs.has_key('checked') and attrs['checked'] == 'checked':
+                self.currentForm.values[attrs['name']] = 'checked'
+            return
         self.currentForm.values[attrs['name']] = None
         if attrs.has_key('value'):
             self.currentForm.values[attrs['name']] = attrs['value']