string/usability updates (thanks to the usability testers)

9 files changed, 337 insertions, 257 deletions

diff --git a/authorization_required.cgi b/authorization_required.cgi
index 2fadcec..dbfff70 100755
--- a/authorization_required.cgi
+++ b/authorization_required.cgi
@@ -51,7 +51,7 @@ if $cgi.include?("poll")
 else
 	$d = Dudle.new(:title => _("Authorization Required"), :hide_lang_chooser => true)
 	returnstr = _("Return to dudle home and Schedule a new Poll")
-	authstr = _("You have to authorize in order to request this page!")
+	authstr = _("You have to authorize yourself in order to access this page!")
 	$d << <<END
 	<p>#{authstr}</p>
 	<ul>
diff --git a/locale/cs/dudle.po b/locale/cs/dudle.po
index ed25371..26b11db 100644
--- a/locale/cs/dudle.po
+++ b/locale/cs/dudle.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-05-10 23:12+0200\n"
+"POT-Creation-Date: 2011-05-17 16:06+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Benjamin Kellermann <Benjamin.Kellermann@tu-dresden.de>\n"
 "Language-Team: \n"
@@ -81,7 +81,7 @@ msgid "Return to dudle home and Schedule a new Poll"
 msgstr "Návrat zpět na domovskou stránku dudle a naplánovat nové hlasování"
 
 #: authorization_required.cgi:54
-msgid "You have to authorize in order to request this page!"
+msgid "You have to authorize yourself in order to access this page!"
 msgstr ""
 
 #: customize.cgi:31 customize.rb:31
@@ -489,7 +489,7 @@ msgstr "Vykonat!"
 msgid "Add and Remove Columns"
 msgstr "Přidat a Odebrat Sloupce"
 
-#: edit_columns.rb:67 edit_columns.rb:86 pollhead.rb:72 timepollhead.rb:248
+#: edit_columns.rb:67 edit_columns.rb:86 timepollhead.rb:248
 msgid "Delete column"
 msgstr "Vymaž sloupec"
 
@@ -497,7 +497,7 @@ msgstr "Vymaž sloupec"
 msgid "Add column"
 msgstr "Přidej sloupec"
 
-#: edit_columns.rb:71 edit_columns.rb:88 pollhead.rb:71
+#: edit_columns.rb:71 edit_columns.rb:88
 msgid "Edit column"
 msgstr "Edituj sloupec"
 
@@ -530,16 +530,16 @@ msgid "Comment"
 msgstr "Komentář"
 
 #: overview.rb:31
-msgid "The link to your poll is:"
-msgstr "Odkaz tvého hlasování je:"
+msgid "The next steps are:"
+msgstr ""
 
 #: overview.rb:33
 msgid "Send this link via email..."
 msgstr "Pošli odkaz prostřednictvím e-mailu..."
 
 #: overview.rb:34
-msgid "To the Vote interface"
-msgstr "K hlasovacímu rozhraní"
+msgid "Visit the poll yourself:"
+msgstr ""
 
 #: overview.rb:35
 msgid "Link to dudle poll about %{polltitle}"
@@ -550,14 +550,12 @@ msgid "The changes were saved, you should be redirected to %{link}."
 msgstr ""
 
 #: poll.rb:86
-#, fuzzy
 msgid "Edit user %{user}..."
-msgstr "Upravit uživatele %{user}"
+msgstr "Upravit uživatele %{user}..."
 
 #: poll.rb:90
-#, fuzzy
 msgid "Delete user %{user}..."
-msgstr "Upravit uživatele %{user}"
+msgstr "Upravit uživatele %{user}..."
 
 #: poll.rb:140
 #, fuzzy
@@ -648,14 +646,24 @@ msgstr "Související s řízením přistupu"
 msgid "Update"
 msgstr "Aktualizace"
 
+#: pollhead.rb:71
+#, fuzzy
+msgid "Edit Option"
+msgstr "Edituj sloupec"
+
+#: pollhead.rb:72
+#, fuzzy
+msgid "Delete Option"
+msgstr "Vymaž sloupec"
+
 #: pollhead.rb:87 timepollhead.rb:162
 msgid "Last Edit"
 msgstr "Poslední Úprava"
 
 #: pollhead.rb:99
 #, fuzzy
-msgid "Alternative"
-msgstr "Název sloupce"
+msgid "Option"
+msgstr "Volitelné:"
 
 #: pollhead.rb:100
 #, fuzzy
@@ -663,7 +671,8 @@ msgid "Description (optional)"
 msgstr "Popis"
 
 #: pollhead.rb:101
-msgid "Add/Edit Column"
+#, fuzzy
+msgid "Add/Edit Option"
 msgstr "Přidat/Editovat sloupec"
 
 #: pollhead.rb:102
@@ -672,9 +681,9 @@ msgstr "Náhled"
 
 #: pollhead.rb:103
 msgid ""
-"Enter all alternatives (columns), you want to ask the participants of the "
-"poll. The participants will state one vote for every alternative you give "
-"here separately."
+"Enter all Options (columns), you want to ask the participants of the poll. "
+"The participants will state one vote for every option you give here "
+"separately."
 msgstr ""
 
 #: timepollhead.rb:113
@@ -741,6 +750,16 @@ msgstr "Přidat"
 msgid "e.&thinsp;g., 09:30, morning, afternoon"
 msgstr "např. 09:30, ráno, odpoledne"
 
+#~ msgid "The link to your poll is:"
+#~ msgstr "Odkaz tvého hlasování je:"
+
+#~ msgid "To the Vote interface"
+#~ msgstr "K hlasovacímu rozhraní"
+
+#, fuzzy
+#~ msgid "Alternative"
+#~ msgstr "Název sloupce"
+
 #~ msgid "Event Schedule Poll"
 #~ msgstr "Hlasování Plánu Události"
 
diff --git a/locale/de/dudle.po b/locale/de/dudle.po
index b2b83b1..1d93bdd 100644
--- a/locale/de/dudle.po
+++ b/locale/de/dudle.po
@@ -19,8 +19,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-05-10 23:12+0200\n"
-"PO-Revision-Date: 2011-03-18 16:55+0100\n"
+"POT-Creation-Date: 2011-05-17 16:06+0200\n"
+"PO-Revision-Date: 2011-05-17 16:08+0100\n"
 "Last-Translator: Benjamin Kellermann <Benjamin.Kellermann@tu-dresden.de>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -34,36 +34,23 @@ msgstr ""
 "X-Poedit-SearchPath-0: .\n"
 
 #: about.cgi:29
-msgid ""
-"If you find a bug or have something else which disturbes you, please let me "
-"know: <a href=\"mailto:Benjamin_dot_Kellermann@tu-dresden_in_germany?"
-"subject=Feedback%20to%20dudle\">give feedback</a>"
-msgstr ""
-"Schreiben Sie mir bitte eine E-Mail, wenn Sie einen Bug finden oder etwas "
-"anderes haben was Sie stört: <a href=\"mailto:Benjamin_dot_Kellermann@tu-"
-"dresden_in_deutschland?subject=dudle%20Feedback\">Feedback</a>"
+msgid "If you find a bug or have something else which disturbes you, please let me know: <a href=\"mailto:Benjamin_dot_Kellermann@tu-dresden_in_germany?subject=Feedback%20to%20dudle\">give feedback</a>"
+msgstr "Schreiben Sie mir bitte eine E-Mail, wenn Sie einen Bug finden oder etwas anderes haben was Sie stört: <a href=\"mailto:Benjamin_dot_Kellermann@tu-dresden_in_deutschland?subject=dudle%20Feedback\">Feedback</a>"
 
 #: about.cgi:31
 msgid "--verbose"
 msgstr "--verbose"
 
 #: about.cgi:32
-msgid ""
-"The sourcecode of this application is available under the terms of <a "
-"href='http://www.fsf.org/licensing/licenses/agpl-3.0.html'>AGPL Version 3</a>"
-msgstr ""
-"Der Sourcecode zu dieser Applikation ist unter der Lizenz <a href='http://"
-"www.fsf.org/licensing/licenses/agpl-3.0.html'>AGPLv3</a> verfügbar."
+msgid "The sourcecode of this application is available under the terms of <a href='http://www.fsf.org/licensing/licenses/agpl-3.0.html'>AGPL Version 3</a>"
+msgstr "Der Sourcecode zu dieser Applikation ist unter der Lizenz <a href='http://www.fsf.org/licensing/licenses/agpl-3.0.html'>AGPLv3</a> verfügbar."
 
 #: about.cgi:34
-msgid ""
-"You can get the sourcecode, using <a href='http://bazaar-vcs.org/'>bazaar</"
-"a>:"
-msgstr ""
-"Sie können sich den Quellcode mit <a href='http://bazaar-vcs.org/'>bazaar</"
-"a> herunterladen:"
+msgid "You can get the sourcecode, using <a href='http://bazaar-vcs.org/'>bazaar</a>:"
+msgstr "Sie können sich den Quellcode mit <a href='http://bazaar-vcs.org/'>bazaar</a> herunterladen:"
 
-#: authorization_required.cgi:36 authorization_required.cgi:52
+#: authorization_required.cgi:36
+#: authorization_required.cgi:52
 msgid "Authorization Required"
 msgstr "Anmeldung Erforderlich"
 
@@ -77,85 +64,100 @@ msgstr "Diese Umfrage ist passwortgeschützt!"
 
 #: authorization_required.cgi:43
 msgid "In order to proceed, you have to give the password for user %{user}."
-msgstr ""
-"Um fortzufahren müssen Sie das Passwort für den Benutzer %{user} eingeben."
+msgstr "Um fortzufahren müssen Sie das Passwort für den Benutzer %{user} eingeben."
 
-#: authorization_required.cgi:53 not_found.cgi:36
+#: authorization_required.cgi:53
+#: not_found.cgi:36
 msgid "Return to dudle home and Schedule a new Poll"
 msgstr "Zurück zur dudle Hauptseite um eine neue Umfrage zu erstellen"
 
 #: authorization_required.cgi:54
-msgid "You have to authorize in order to request this page!"
-msgstr "Um auf diese Seite zugreifen zu können müssen Sie sich autorisieren."
+msgid "You have to authorize yourself in order to access this page!"
+msgstr "Um auf diese Seite zugreifen zu können müssen Sie sich autorisieren!"
 
-#: customize.cgi:31 customize.rb:31
+#: customize.cgi:31
+#: customize.rb:31
 msgid "Customize Personal Settings"
 msgstr "Persönliche Einstellungen anpassen"
 
-#: customize.cgi:32 customize.rb:32
+#: customize.cgi:32
+#: customize.rb:32
 msgid "You need cookies enabled in order to personalize your settings."
-msgstr ""
-"Ihr Browser muss Cookies akzeptieren um persönliche Einstellungen dauerhaft "
-"vorzunehmen."
+msgstr "Ihr Browser muss Cookies akzeptieren um persönliche Einstellungen dauerhaft vorzunehmen."
 
-#: customize.cgi:39 customize.rb:39
+#: customize.cgi:39
+#: customize.rb:39
 msgid "Current Setting"
 msgstr "Momentane Einstellung"
 
-#: customize.cgi:40 customize.rb:40
+#: customize.cgi:40
+#: customize.rb:40
 msgid "Description"
 msgstr "Beschreibung"
 
-#: customize.cgi:57 customize.rb:57
+#: customize.cgi:57
+#: customize.rb:57
 msgid "Use special characters"
 msgstr "Benutze spezielle Zeichen"
 
-#: customize.cgi:57 customize.rb:57
+#: customize.cgi:57
+#: customize.rb:57
 msgid "Use this option if you see the characters in the parenthesis."
-msgstr ""
-"Benutzen Sie diese Einstellung, wenn Sie die Zeichen in den Klammern lesen "
-"können."
+msgstr "Benutzen Sie diese Einstellung, wenn Sie die Zeichen in den Klammern lesen können."
 
-#: customize.cgi:58 customize.rb:58
+#: customize.cgi:58
+#: customize.rb:58
 msgid "Use only normal strings"
 msgstr "Benutze nur gewöhnliche Zeichen"
 
-#: customize.cgi:58 customize.rb:58
+#: customize.cgi:58
+#: customize.rb:58
 msgid "Use this option if you have problems with some characters."
-msgstr ""
-"Benutzen Sie diese Einstellung, wenn Probleme mit der Darstellung einiger "
-"Zeichen auftreten."
+msgstr "Benutzen Sie diese Einstellung, wenn Probleme mit der Darstellung einiger Zeichen auftreten."
 
-#: customize.cgi:61 customize.rb:61
+#: customize.cgi:61
+#: customize.rb:61
 msgid "Charset"
 msgstr "Zeichen"
 
-#: customize.cgi:66 customize.rb:66
+#: customize.cgi:66
+#: customize.rb:66
 msgid "Stylesheet"
 msgstr "Aussehen"
 
-#: customize.cgi:82 customize.rb:82
+#: customize.cgi:82
+#: customize.rb:82
 msgid "Default Username"
 msgstr "Voreingestellter Benutzername"
 
-#: customize.cgi:83 access_control.rb:76 customize.rb:83
+#: customize.cgi:83
+#: access_control.rb:76
+#: customize.rb:83
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: customize.cgi:107 customize.rb:107
+#: customize.cgi:107
+#: customize.rb:107
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: customize.cgi:117 access_control.rb:123 customize.rb:117 poll.rb:286
+#: customize.cgi:117
+#: access_control.rb:123
+#: customize.rb:117
+#: poll.rb:286
 msgid "Save"
 msgstr "Speichern"
 
-#: customize.cgi:120 access_control.rb:119 customize.rb:120 delete_poll.rb:103
+#: customize.cgi:120
+#: access_control.rb:119
+#: customize.rb:120
+#: delete_poll.rb:103
 #: poll.rb:324
 msgid "Delete"
 msgstr "Löschen"
 
-#: error.cgi:25 error.cgi:27
+#: error.cgi:25
+#: error.cgi:27
 msgid "Error"
 msgstr "Fehler"
 
@@ -194,29 +196,21 @@ msgid "Bug in dudle"
 msgstr "Fehler im dudle"
 
 #: error.cgi:53
-msgid ""
-"An error occured while executing dudle.<br/>Please send an error report, "
-"including your browser, operating system, and what you did to %{admin}."
-msgstr ""
-"Während der Ausführung von dudle gab es einen Fehler.<br/>Bitte schicken Sie "
-"einen Fehlerbericht in dem Sie den Namen Ihres Browsers, Ihres "
-"Betriebssystems und was Sie gemacht haben angeben an %{admin}."
+msgid "An error occured while executing dudle.<br/>Please send an error report, including your browser, operating system, and what you did to %{admin}."
+msgstr "Während der Ausführung von dudle gab es einen Fehler.<br/>Bitte schicken Sie einen Fehlerbericht in dem Sie den Namen Ihres Browsers, Ihres Betriebssystems und was Sie gemacht haben angeben an %{admin}."
 
 #: error.cgi:56
 msgid "Please include the following as well:"
 msgstr "Bitte schicken Sie auch die folgende Fehlermeldung:"
 
-#: example.cgi:60 dudle.rb:89
+#: example.cgi:60
+#: dudle.rb:89
 msgid "Examples"
 msgstr "Beispiele"
 
 #: example.cgi:61
-msgid ""
-"If you want to play with the application, you may want to take a look at "
-"these example polls:"
-msgstr ""
-"Wenn Sie diese Applikation ausprobieren möchten, können Sie auch auf "
-"folgende Beispielumfragen schauen:"
+msgid "If you want to play with the application, you may want to take a look at these example polls:"
+msgstr "Wenn Sie diese Applikation ausprobieren möchten, können Sie auch auf folgende Beispielumfragen schauen:"
 
 #: index.cgi:32
 msgid "Please enter a descriptive title."
@@ -224,20 +218,15 @@ msgstr "Bitte geben Sie einen Titel für die Umfrage ein."
 
 #: index.cgi:48
 msgid "Custom address may only contain letters, numbers, and dashes."
-msgstr ""
-"Die spezielle eigene URL darf nur Buchstaben, Zahlen, Bindestrich und "
-"Unterstrich enthalten."
+msgstr "Die spezielle eigene URL darf nur Buchstaben, Zahlen, Bindestrich und Unterstrich enthalten."
 
 #: index.cgi:50
 msgid "A Poll with this address already exists."
 msgstr "Eine Umfrage mit dieser URL existiert bereits."
 
 #: index.cgi:69
-msgid ""
-"The poll was created successfully. The link to your new poll is: %{link}"
-msgstr ""
-"Die Umfrage wurde erfolgreich erstellt. Die Adresse der Umfrage lautet: "
-"%{link}"
+msgid "The poll was created successfully. The link to your new poll is: %{link}"
+msgstr "Die Umfrage wurde erfolgreich erstellt. Die Adresse der Umfrage lautet: %{link}"
 
 #: index.cgi:76
 msgid "Create New Poll"
@@ -285,24 +274,15 @@ msgstr "Es gibt mehrere Gründe, warum eine Umfrage gelöscht wurde:"
 
 #: not_found.cgi:33
 msgid "Somebody clicked on “Delete Poll” and deleted the poll manually."
-msgstr ""
-"Jemand hat auf „Umfrage löschen“ geklickt und die Umfrage manuell gelöscht"
+msgstr "Jemand hat auf „Umfrage löschen“ geklickt und die Umfrage manuell gelöscht"
 
 #: not_found.cgi:34
-msgid ""
-"The Poll was deleted by the administrator because it was not accessed for a "
-"long time."
-msgstr ""
-"Die Umfrage wurde vom Administrator gelöscht, weil lange nicht auf sie "
-"zugegriffen wurde."
+msgid "The Poll was deleted by the administrator because it was not accessed for a long time."
+msgstr "Die Umfrage wurde vom Administrator gelöscht, weil lange nicht auf sie zugegriffen wurde."
 
 #: not_found.cgi:35
-msgid ""
-"If you think, the deletion was done by error, please contact the "
-"adminsistrator of the system."
-msgstr ""
-"Bitte kontaktieren Sie den Administrator des Systems, wenn Sie denken, dass "
-"die Umfrage versehentlich gelöscht wurde."
+msgid "If you think, the deletion was done by error, please contact the adminsistrator of the system."
+msgstr "Bitte kontaktieren Sie den Administrator des Systems, wenn Sie denken, dass die Umfrage versehentlich gelöscht wurde."
 
 #: access_control.rb:89
 msgid "Password"
@@ -313,12 +293,8 @@ msgid "repeat"
 msgstr "wiederholen"
 
 #: access_control.rb:116
-msgid ""
-"You have to remove the participant user before you can remove the "
-"administrator."
-msgstr ""
-"Der Benutzer „participant“ muss entfernt werden, bevor Sie den Administrator "
-"entfernen können."
+msgid "You have to remove the participant user before you can remove the administrator."
+msgstr "Der Benutzer „participant“ muss entfernt werden, bevor Sie den Administrator entfernen können."
 
 #: access_control.rb:141
 msgid "Only letters and digits are allowed in the username."
@@ -342,9 +318,7 @@ msgstr "Aktivieren"
 
 #: access_control.rb:185
 msgid "will be activated when at least an admin user is configured"
-msgstr ""
-"wird aktiviert, wenn ein Administrator (Benutzername: „admin“) konfiguriert "
-"wurde"
+msgstr "wird aktiviert, wenn ein Administrator (Benutzername: „admin“) konfiguriert wurde"
 
 #: access_control.rb:187
 msgid "Deactivate"
@@ -355,27 +329,16 @@ msgid "activated"
 msgstr "aktiviert"
 
 #: access_control.rb:190
-msgid ""
-"You have to remove all users before you can deactivate the access control "
-"settings."
-msgstr ""
-"Sie müssen alle Benutzer entfernen, bevor Sie die Zugriffskontrolle "
-"deaktivieren können."
+msgid "You have to remove all users before you can deactivate the access control settings."
+msgstr "Sie müssen alle Benutzer entfernen, bevor Sie die Zugriffskontrolle deaktivieren können."
 
 #: access_control.rb:194
-msgid ""
-"You will be asked for the password you entered here after pressing save!"
-msgstr ""
-"Nach dem Speichern werden Sie nach dem Benutzernamen und diesem Passwort "
-"gefragt!"
+msgid "You will be asked for the password you entered here after pressing save!"
+msgstr "Nach dem Speichern werden Sie nach dem Benutzernamen und diesem Passwort gefragt!"
 
 #: access_control.rb:197
-msgid ""
-"The user ‘admin’ has access to the vote as well as the configuration "
-"interface."
-msgstr ""
-"Der Benutzer „admin“ hat sowohl zur Abstimmungs- als auch zur "
-"Konfigurationsoberfläche Zugriff."
+msgid "The user ‘admin’ has access to the vote as well as the configuration interface."
+msgstr "Der Benutzer „admin“ hat sowohl zur Abstimmungs- als auch zur Konfigurationsoberfläche Zugriff."
 
 #: access_control.rb:203
 msgid "The user ‘participant’ has only access to the vote interface."
@@ -406,14 +369,8 @@ msgid "The poll was deleted successfully!"
 msgstr "Die Umfrage wurde erfolgreich gelöscht!"
 
 #: delete_poll.rb:49
-msgid ""
-"If this was done by accident, please contact the administrator of the "
-"system. The poll can be recovered for an indeterministic amount of time, "
-"maybe it is already to late."
-msgstr ""
-"Wenn das ein Versehen war, kontaktieren Sie bitte umgehend den Administrator "
-"des Systems. Die Umfrage kann für einen unvorhersehbaren Zeitraum "
-"wiederhergestellt werden, vielleicht ist jetzt schon zu spät."
+msgid "If this was done by accident, please contact the administrator of the system. The poll can be recovered for an indeterministic amount of time, maybe it is already to late."
+msgstr "Wenn das ein Versehen war, kontaktieren Sie bitte umgehend den Administrator des Systems. Die Umfrage kann für einen unvorhersehbaren Zeitraum wiederhergestellt werden, vielleicht ist jetzt schon zu spät."
 
 #: delete_poll.rb:50
 msgid "Things you can do now are"
@@ -452,12 +409,8 @@ msgid "This is an irreversible action!"
 msgstr "Das Löschen der gesamten Umfrage ist unwiederrufbar!"
 
 #: delete_poll.rb:102
-msgid ""
-"If you are sure in what you are doing, please type “%{question}” into the "
-"form."
-msgstr ""
-"Wenn Sie sich sicher sind, dann geben Sie bitte „%{question}“ in das "
-"folgende Formular ein."
+msgid "If you are sure in what you are doing, please type “%{question}” into the form."
+msgstr "Wenn Sie sich sicher sind, dann geben Sie bitte „%{question}“ in das folgende Formular ein."
 
 #: dudle.rb:73
 msgid "Home"
@@ -467,7 +420,8 @@ msgstr "Hauptseite"
 msgid "Poll"
 msgstr "Umfrage"
 
-#: dudle.rb:77 history.rb:35
+#: dudle.rb:77
+#: history.rb:35
 msgid "History"
 msgstr "Versionen"
 
@@ -475,7 +429,8 @@ msgstr "Versionen"
 msgid "Edit Columns"
 msgstr "Spalten bearbeiten"
 
-#: dudle.rb:81 invite_participants.rb:38
+#: dudle.rb:81
+#: invite_participants.rb:38
 msgid "Invite Participants"
 msgstr "Teilnehmer einladen"
 
@@ -503,15 +458,18 @@ msgstr "Personalisieren"
 msgid "Dudle Home"
 msgstr "Dudle Startseite"
 
-#: dudle.rb:196 dudle.rb:214
+#: dudle.rb:196
+#: dudle.rb:214
 msgid "Previous"
 msgstr "Zurück"
 
-#: dudle.rb:197 dudle.rb:215
+#: dudle.rb:197
+#: dudle.rb:215
 msgid "Next"
 msgstr "Weiter"
 
-#: dudle.rb:198 dudle.rb:216
+#: dudle.rb:198
+#: dudle.rb:216
 msgid "Finish"
 msgstr "Fertig"
 
@@ -527,15 +485,20 @@ msgstr "Weiter"
 msgid "Add and Remove Columns"
 msgstr "Spalten hinzufügen oder entfernen"
 
-#: edit_columns.rb:67 edit_columns.rb:86 pollhead.rb:72 timepollhead.rb:248
+#: edit_columns.rb:67
+#: edit_columns.rb:86
+#: timepollhead.rb:248
 msgid "Delete column"
 msgstr "Lösche Spalte"
 
-#: edit_columns.rb:69 edit_columns.rb:84 timepollhead.rb:247
+#: edit_columns.rb:69
+#: edit_columns.rb:84
+#: timepollhead.rb:247
 msgid "Add column"
 msgstr "Füge Spalte hinzu"
 
-#: edit_columns.rb:71 edit_columns.rb:88 pollhead.rb:71
+#: edit_columns.rb:71
+#: edit_columns.rb:88
 msgid "Edit column"
 msgstr "Bearbeite Spalte"
 
@@ -568,16 +531,16 @@ msgid "Comment"
 msgstr "Kommentar"
 
 #: overview.rb:31
-msgid "The link to your poll is:"
-msgstr "Die URL zu Ihrer Umfrage ist:"
+msgid "The next steps are:"
+msgstr "Die nächsten Schritte sind:"
 
 #: overview.rb:33
 msgid "Send this link via email..."
 msgstr "Diese URL per E-Mail verschicken..."
 
 #: overview.rb:34
-msgid "To the Vote interface"
-msgstr "Zur Abstimmung"
+msgid "Visit the poll yourself:"
+msgstr "Besuchen Sie selbst die Umfrage:"
 
 #: overview.rb:35
 msgid "Link to dudle poll about %{polltitle}"
@@ -585,9 +548,7 @@ msgstr "Dudle Umfrage über %{polltitle}"
 
 #: participate.rb:59
 msgid "The changes were saved, you should be redirected to %{link}."
-msgstr ""
-"Die Änderungen wurden gespeichert. Sie sollten zu %{link} weitergeleitet "
-"werden."
+msgstr "Die Änderungen wurden gespeichert. Sie sollten zu %{link} weitergeleitet werden."
 
 #: poll.rb:86
 msgid "Edit user %{user}..."
@@ -605,7 +566,9 @@ msgstr "Summe"
 msgid "Invite"
 msgstr "Einladen"
 
-#: poll.rb:173 pollhead.rb:62 timepollhead.rb:158
+#: poll.rb:173
+#: pollhead.rb:62
+#: timepollhead.rb:158
 msgid "Name"
 msgstr "Name"
 
@@ -685,43 +648,42 @@ msgstr "Zugriffskontrolle betreffend"
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: pollhead.rb:87 timepollhead.rb:162
+#: pollhead.rb:71
+msgid "Edit Option"
+msgstr "Option bearbeiten"
+
+#: pollhead.rb:72
+msgid "Delete Option"
+msgstr "Option löschen"
+
+#: pollhead.rb:87
+#: timepollhead.rb:162
 msgid "Last Edit"
 msgstr "Letzte Änderung"
 
 #: pollhead.rb:99
-msgid "Alternative"
-msgstr "Alternative"
+msgid "Option"
+msgstr "Option"
 
 #: pollhead.rb:100
 msgid "Description (optional)"
 msgstr "Beschreibung (optional)"
 
 #: pollhead.rb:101
-msgid "Add/Edit Column"
-msgstr "Spalte bearbeiten/hinzufügen"
+msgid "Add/Edit Option"
+msgstr "Option bearbeiten/hinzufügen"
 
 #: pollhead.rb:102
 msgid "Preview"
 msgstr "Vorschau"
 
 #: pollhead.rb:103
-msgid ""
-"Enter all alternatives (columns), you want to ask the participants of the "
-"poll. The participants will state one vote for every alternative you give "
-"here separately."
-msgstr ""
-"Geben Sie alle Alternativen (Spalten) ein, nach denen in der Umfrage gefragt "
-"werden soll. Die Teilnehmer der Umfrage können für jede Alternative einzeln "
-"ihre Stimme abgeben."
+msgid "Enter all Options (columns), you want to ask the participants of the poll. The participants will state one vote for every option you give here separately."
+msgstr "Geben Sie alle Optionen (Spalten) ein, nach denen in der Umfrage gefragt werden soll. Die Teilnehmer der Umfrage können für jede Option einzeln ihre Stimme abgeben."
 
 #: timepollhead.rb:113
-msgid ""
-"To add some time different to the default ones, please enter some string "
-"here (e.&thinsp;g., 09:30, morning, afternoon)."
-msgstr ""
-"Geben Sie eine Zeit ein, um eine andere als die vorgeschlagenen Zeiten "
-"auszuwählen (z.&thinsp;B. 9:30, morgens, abends)."
+msgid "To add some time different to the default ones, please enter some string here (e.&thinsp;g., 09:30, morning, afternoon)."
+msgstr "Geben Sie eine Zeit ein, um eine andere als die vorgeschlagenen Zeiten auszuwählen (z.&thinsp;B. 9:30, morgens, abends)."
 
 #: timepollhead.rb:119
 msgid "This Time was already choosen."
@@ -779,6 +741,15 @@ msgstr "Hinzufügen"
 msgid "e.&thinsp;g., 09:30, morning, afternoon"
 msgstr "z.B., 9:30, morgens, abends"
 
+#~ msgid "The link to your poll is:"
+#~ msgstr "Die URL zu Ihrer Umfrage ist:"
+
+#~ msgid "To the Vote interface"
+#~ msgstr "Zur Abstimmung"
+
+#~ msgid "Alternative"
+#~ msgstr "Alternative"
+
 #~ msgid "Event Schedule Poll"
 #~ msgstr "Nach einer Zeit fragen"
 
diff --git a/locale/fr/dudle.po b/locale/fr/dudle.po
index 6072f9f..ac129be 100644
--- a/locale/fr/dudle.po
+++ b/locale/fr/dudle.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-05-10 23:12+0200\n"
+"POT-Creation-Date: 2011-05-17 16:06+0200\n"
 "PO-Revision-Date: 2011-05-03 16:46+0100\n"
 "Last-Translator: Gilles Seban\n"
 "Language-Team: \n"
@@ -87,7 +87,7 @@ msgid "Return to dudle home and Schedule a new Poll"
 msgstr "Retour à la page d'accueil et créer un nouveau sondage"
 
 #: authorization_required.cgi:54
-msgid "You have to authorize in order to request this page!"
+msgid "You have to authorize yourself in order to access this page!"
 msgstr "Vous devez vous identifier pour afficher cette page !"
 
 #: customize.cgi:31 customize.rb:31
@@ -512,7 +512,7 @@ msgstr ""
 msgid "Add and Remove Columns"
 msgstr "Ajouter et supprimer des colonnes"
 
-#: edit_columns.rb:67 edit_columns.rb:86 pollhead.rb:72 timepollhead.rb:248
+#: edit_columns.rb:67 edit_columns.rb:86 timepollhead.rb:248
 msgid "Delete column"
 msgstr "Supprimer une colonne"
 
@@ -520,7 +520,7 @@ msgstr "Supprimer une colonne"
 msgid "Add column"
 msgstr "Ajouter une colonne"
 
-#: edit_columns.rb:71 edit_columns.rb:88 pollhead.rb:71
+#: edit_columns.rb:71 edit_columns.rb:88
 msgid "Edit column"
 msgstr "Éditer une colonne"
 
@@ -553,16 +553,16 @@ msgid "Comment"
 msgstr "Commentaire"
 
 #: overview.rb:31
-msgid "The link to your poll is:"
-msgstr "Le lien de votre sondage est :"
+msgid "The next steps are:"
+msgstr ""
 
 #: overview.rb:33
 msgid "Send this link via email..."
 msgstr "Envoyer ce lien par email..."
 
 #: overview.rb:34
-msgid "To the Vote interface"
-msgstr "Vers la page de vote"
+msgid "Visit the poll yourself:"
+msgstr ""
 
 #: overview.rb:35
 msgid "Link to dudle poll about %{polltitle}"
@@ -670,20 +670,32 @@ msgstr ""
 msgid "Update"
 msgstr "Mettre à jour"
 
+#: pollhead.rb:71
+#, fuzzy
+msgid "Edit Option"
+msgstr "Éditer une colonne"
+
+#: pollhead.rb:72
+#, fuzzy
+msgid "Delete Option"
+msgstr "Supprimer une colonne"
+
 #: pollhead.rb:87 timepollhead.rb:162
 msgid "Last Edit"
 msgstr "Dernière édition"
 
 #: pollhead.rb:99
-msgid "Alternative"
-msgstr "Alternative"
+#, fuzzy
+msgid "Option"
+msgstr "Optionnel :"
 
 #: pollhead.rb:100
 msgid "Description (optional)"
 msgstr "Description (optionnel)"
 
 #: pollhead.rb:101
-msgid "Add/Edit Column"
+#, fuzzy
+msgid "Add/Edit Option"
 msgstr "Ajouter/Éditer la colonne"
 
 #: pollhead.rb:102
@@ -692,9 +704,9 @@ msgstr "Prévisualiser"
 
 #: pollhead.rb:103
 msgid ""
-"Enter all alternatives (columns), you want to ask the participants of the "
-"poll. The participants will state one vote for every alternative you give "
-"here separately."
+"Enter all Options (columns), you want to ask the participants of the poll. "
+"The participants will state one vote for every option you give here "
+"separately."
 msgstr ""
 
 #: timepollhead.rb:113
@@ -759,6 +771,15 @@ msgstr "Ajouter"
 msgid "e.&thinsp;g., 09:30, morning, afternoon"
 msgstr ""
 
+#~ msgid "The link to your poll is:"
+#~ msgstr "Le lien de votre sondage est :"
+
+#~ msgid "To the Vote interface"
+#~ msgstr "Vers la page de vote"
+
+#~ msgid "Alternative"
+#~ msgstr "Alternative"
+
 #~ msgid "Event Schedule Poll"
 #~ msgstr "Sondage de choix de date"
 
diff --git a/locale/it/dudle.po b/locale/it/dudle.po
index 30c8e84..5f07701 100644
--- a/locale/it/dudle.po
+++ b/locale/it/dudle.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-05-10 23:12+0200\n"
+"POT-Creation-Date: 2011-05-17 16:06+0200\n"
 "PO-Revision-Date: 2011-05-10 07:31+0200\n"
 "Last-Translator: Eros Pedrini\n"
 "Language-Team: \n"
@@ -80,7 +80,7 @@ msgid "Return to dudle home and Schedule a new Poll"
 msgstr "Ritorna alla pagina principale di Dudle e Programma un nuovo Sondaggio"
 
 #: authorization_required.cgi:54
-msgid "You have to authorize in order to request this page!"
+msgid "You have to authorize yourself in order to access this page!"
 msgstr "Devi essere autorizzato per accedere a questa pagina!"
 
 #: customize.cgi:31 customize.rb:31
@@ -518,7 +518,7 @@ msgstr "Procedi!"
 msgid "Add and Remove Columns"
 msgstr "Aggiungi e Rimuovi Colonne"
 
-#: edit_columns.rb:67 edit_columns.rb:86 pollhead.rb:72 timepollhead.rb:248
+#: edit_columns.rb:67 edit_columns.rb:86 timepollhead.rb:248
 msgid "Delete column"
 msgstr "Elimina Colonna"
 
@@ -526,7 +526,7 @@ msgstr "Elimina Colonna"
 msgid "Add column"
 msgstr "Aggiungi Colonna"
 
-#: edit_columns.rb:71 edit_columns.rb:88 pollhead.rb:71
+#: edit_columns.rb:71 edit_columns.rb:88
 msgid "Edit column"
 msgstr "Modifica Colonna"
 
@@ -559,16 +559,16 @@ msgid "Comment"
 msgstr "Commento"
 
 #: overview.rb:31
-msgid "The link to your poll is:"
-msgstr "Il link al tuo sondaggio è:"
+msgid "The next steps are:"
+msgstr ""
 
 #: overview.rb:33
 msgid "Send this link via email..."
 msgstr "Spedisci questo link via email..."
 
 #: overview.rb:34
-msgid "To the Vote interface"
-msgstr "Vai all'interfaccia di Votazione"
+msgid "Visit the poll yourself:"
+msgstr ""
 
 #: overview.rb:35
 msgid "Link to dudle poll about %{polltitle}"
@@ -674,20 +674,31 @@ msgstr "Controllo dell'Accesso correlato"
 msgid "Update"
 msgstr "Aggiorna"
 
+#: pollhead.rb:71
+#, fuzzy
+msgid "Edit Option"
+msgstr "Modifica Colonna"
+
+#: pollhead.rb:72
+#, fuzzy
+msgid "Delete Option"
+msgstr "Elimina Colonna"
+
 #: pollhead.rb:87 timepollhead.rb:162
 msgid "Last Edit"
 msgstr "Ultima Modifica"
 
 #: pollhead.rb:99
-msgid "Alternative"
-msgstr "Alternativo"
+msgid "Option"
+msgstr ""
 
 #: pollhead.rb:100
 msgid "Description (optional)"
 msgstr "Descrizione (opzionale)"
 
 #: pollhead.rb:101
-msgid "Add/Edit Column"
+#, fuzzy
+msgid "Add/Edit Option"
 msgstr "Aggiungi/Modifica Colonna"
 
 #: pollhead.rb:102
@@ -695,10 +706,11 @@ msgid "Preview"
 msgstr "Anteprima"
 
 #: pollhead.rb:103
+#, fuzzy
 msgid ""
-"Enter all alternatives (columns), you want to ask the participants of the "
-"poll. The participants will state one vote for every alternative you give "
-"here separately."
+"Enter all Options (columns), you want to ask the participants of the poll. "
+"The participants will state one vote for every option you give here "
+"separately."
 msgstr ""
 "Inserisci tutte le possibilità (colonne) che vuoi chiedere ai partecipanti "
 "al sondaggio. I partecipanti potranno dare un voto per ogni possibilità che "
@@ -768,5 +780,14 @@ msgstr "Aggiungi"
 msgid "e.&thinsp;g., 09:30, morning, afternoon"
 msgstr "e.&thinsp;g., 09:30, mattina, pomeriggio"
 
+#~ msgid "The link to your poll is:"
+#~ msgstr "Il link al tuo sondaggio è:"
+
+#~ msgid "To the Vote interface"
+#~ msgstr "Vai all'interfaccia di Votazione"
+
+#~ msgid "Alternative"
+#~ msgstr "Alternativo"
+
 #~ msgid "Facoltativo:"
 #~ msgstr "Opzionale:"
diff --git a/locale/nl/dudle.po b/locale/nl/dudle.po
index d27e29f..40fe1c5 100644
--- a/locale/nl/dudle.po
+++ b/locale/nl/dudle.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-05-12 11:24+0200\n"
+"POT-Creation-Date: 2011-05-17 16:06+0200\n"
 "PO-Revision-Date: 2011-05-11 13:46+0100\n"
 "Last-Translator: Joeri de Ruiter <joeri@cs.ru.nl>\n"
 "Language-Team: \n"
@@ -82,7 +82,7 @@ msgid "Return to dudle home and Schedule a new Poll"
 msgstr "Keer terug naar dudle home en plan een nieuwe Poll"
 
 #: authorization_required.cgi:54
-msgid "You have to authorize in order to request this page!"
+msgid "You have to authorize yourself in order to access this page!"
 msgstr "Je moet je authoriseren om deze pagina te kunnen bekijken!"
 
 #: customize.cgi:31 customize.rb:31
@@ -512,7 +512,7 @@ msgstr "Doorgaan!"
 msgid "Add and Remove Columns"
 msgstr "Voeg toe / Verwijder Kolommen"
 
-#: edit_columns.rb:67 edit_columns.rb:86 pollhead.rb:72 timepollhead.rb:248
+#: edit_columns.rb:67 edit_columns.rb:86 timepollhead.rb:248
 msgid "Delete column"
 msgstr "Verwijder kolom"
 
@@ -520,7 +520,7 @@ msgstr "Verwijder kolom"
 msgid "Add column"
 msgstr "Voeg kolom toe"
 
-#: edit_columns.rb:71 edit_columns.rb:88 pollhead.rb:71
+#: edit_columns.rb:71 edit_columns.rb:88
 msgid "Edit column"
 msgstr "Wijzig kolom"
 
@@ -553,16 +553,16 @@ msgid "Comment"
 msgstr "Commentaar"
 
 #: overview.rb:31
-msgid "The link to your poll is:"
-msgstr "De link naar de poll is:"
+msgid "The next steps are:"
+msgstr ""
 
 #: overview.rb:33
 msgid "Send this link via email..."
 msgstr "Verstuur deze link per email..."
 
 #: overview.rb:34
-msgid "To the Vote interface"
-msgstr "Naar de Stem interface"
+msgid "Visit the poll yourself:"
+msgstr ""
 
 #: overview.rb:35
 msgid "Link to dudle poll about %{polltitle}"
@@ -668,20 +668,32 @@ msgstr "Toegangsrechten gerelateerd"
 msgid "Update"
 msgstr "Wijzig"
 
+#: pollhead.rb:71
+#, fuzzy
+msgid "Edit Option"
+msgstr "Wijzig kolom"
+
+#: pollhead.rb:72
+#, fuzzy
+msgid "Delete Option"
+msgstr "Verwijder kolom"
+
 #: pollhead.rb:87 timepollhead.rb:162
 msgid "Last Edit"
 msgstr "Laatste Wijziging"
 
 #: pollhead.rb:99
-msgid "Alternative"
-msgstr "Alternatief"
+#, fuzzy
+msgid "Option"
+msgstr "Optioneel:"
 
 #: pollhead.rb:100
 msgid "Description (optional)"
 msgstr "Beschrijving (optioneel)"
 
 #: pollhead.rb:101
-msgid "Add/Edit Column"
+#, fuzzy
+msgid "Add/Edit Option"
 msgstr "Voeg toe/Wijzig kolom"
 
 #: pollhead.rb:102
@@ -689,10 +701,11 @@ msgid "Preview"
 msgstr "Voorbeeld"
 
 #: pollhead.rb:103
+#, fuzzy
 msgid ""
-"Enter all alternatives (columns), you want to ask the participants of the "
-"poll. The participants will state one vote for every alternative you give "
-"here separately."
+"Enter all Options (columns), you want to ask the participants of the poll. "
+"The participants will state one vote for every option you give here "
+"separately."
 msgstr ""
 "Voer alle alternatieven (kolommen) in die je de deelnemers van de poll wilt "
 "vragen. De deelnemers geven een aparte stem voor elk van deze alternatieven."
@@ -760,3 +773,12 @@ msgstr "Voeg toe"
 #: timepollhead.rb:428
 msgid "e.&thinsp;g., 09:30, morning, afternoon"
 msgstr "bijvoorbeeld 09:30, ochtend, middag"
+
+#~ msgid "The link to your poll is:"
+#~ msgstr "De link naar de poll is:"
+
+#~ msgid "To the Vote interface"
+#~ msgstr "Naar de Stem interface"
+
+#~ msgid "Alternative"
+#~ msgstr "Alternatief"
diff --git a/locale/sv/dudle.po b/locale/sv/dudle.po
index b3e6389..357715d 100644
--- a/locale/sv/dudle.po
+++ b/locale/sv/dudle.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-05-10 23:12+0200\n"
+"POT-Creation-Date: 2011-05-17 16:06+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Benjamin Kellermann <Benjamin.Kellermann@tu-dresden.de>\n"
 "Language-Team: \n"
@@ -80,7 +80,7 @@ msgid "Return to dudle home and Schedule a new Poll"
 msgstr "Tillbaka till dudle hem och skapa en ny omröstning"
 
 #: authorization_required.cgi:54
-msgid "You have to authorize in order to request this page!"
+msgid "You have to authorize yourself in order to access this page!"
 msgstr ""
 
 #: customize.cgi:31 customize.rb:31
@@ -489,7 +489,7 @@ msgstr "Fortsätt!"
 msgid "Add and Remove Columns"
 msgstr "Lägg till eller ta bort kolumner"
 
-#: edit_columns.rb:67 edit_columns.rb:86 pollhead.rb:72 timepollhead.rb:248
+#: edit_columns.rb:67 edit_columns.rb:86 timepollhead.rb:248
 msgid "Delete column"
 msgstr "Ta bort kolumn"
 
@@ -497,7 +497,7 @@ msgstr "Ta bort kolumn"
 msgid "Add column"
 msgstr "Lägg till kolumn"
 
-#: edit_columns.rb:71 edit_columns.rb:88 pollhead.rb:71
+#: edit_columns.rb:71 edit_columns.rb:88
 msgid "Edit column"
 msgstr "Redigera kolumn"
 
@@ -530,16 +530,16 @@ msgid "Comment"
 msgstr "Kommentar"
 
 #: overview.rb:31
-msgid "The link to your poll is:"
-msgstr "Länk till din omröstning:"
+msgid "The next steps are:"
+msgstr ""
 
 #: overview.rb:33
 msgid "Send this link via email..."
 msgstr "Skicka länken via email..."
 
 #: overview.rb:34
-msgid "To the Vote interface"
-msgstr "Till gränssnittet för röstning"
+msgid "Visit the poll yourself:"
+msgstr ""
 
 #: overview.rb:35
 msgid "Link to dudle poll about %{polltitle}"
@@ -550,14 +550,12 @@ msgid "The changes were saved, you should be redirected to %{link}."
 msgstr ""
 
 #: poll.rb:86
-#, fuzzy
 msgid "Edit user %{user}..."
-msgstr "Redigera användare %{user}"
+msgstr "Redigera användare %{user}..."
 
 #: poll.rb:90
-#, fuzzy
 msgid "Delete user %{user}..."
-msgstr "Redigera användare %{user}"
+msgstr "Redigera användare %{user}..."
 
 #: poll.rb:140
 msgid "Total"
@@ -648,14 +646,24 @@ msgstr "Tillhörande åtkomstkontroll"
 msgid "Update"
 msgstr "Uppdatera"
 
+#: pollhead.rb:71
+#, fuzzy
+msgid "Edit Option"
+msgstr "Redigera kolumn"
+
+#: pollhead.rb:72
+#, fuzzy
+msgid "Delete Option"
+msgstr "Ta bort kolumn"
+
 #: pollhead.rb:87 timepollhead.rb:162
 msgid "Last Edit"
 msgstr "Senast ändrat"
 
 #: pollhead.rb:99
 #, fuzzy
-msgid "Alternative"
-msgstr "Kolumntitel"
+msgid "Option"
+msgstr "Valfri:"
 
 #: pollhead.rb:100
 #, fuzzy
@@ -663,7 +671,8 @@ msgid "Description (optional)"
 msgstr "Beskrivning"
 
 #: pollhead.rb:101
-msgid "Add/Edit Column"
+#, fuzzy
+msgid "Add/Edit Option"
 msgstr "Lägg till/redigera kolumn"
 
 #: pollhead.rb:102
@@ -672,9 +681,9 @@ msgstr "Förhandsgranska"
 
 #: pollhead.rb:103
 msgid ""
-"Enter all alternatives (columns), you want to ask the participants of the "
-"poll. The participants will state one vote for every alternative you give "
-"here separately."
+"Enter all Options (columns), you want to ask the participants of the poll. "
+"The participants will state one vote for every option you give here "
+"separately."
 msgstr ""
 
 #: timepollhead.rb:113
@@ -740,6 +749,16 @@ msgstr "Lägg till"
 msgid "e.&thinsp;g., 09:30, morning, afternoon"
 msgstr "t ex 09:30, morgon, eftermiddag"
 
+#~ msgid "The link to your poll is:"
+#~ msgstr "Länk till din omröstning:"
+
+#~ msgid "To the Vote interface"
+#~ msgstr "Till gränssnittet för röstning"
+
+#, fuzzy
+#~ msgid "Alternative"
+#~ msgstr "Kolumntitel"
+
 #~ msgid "Event Schedule Poll"
 #~ msgstr "Händelseschema Omröstning"
 
diff --git a/overview.rb b/overview.rb
index 0556732..16cd6bd 100755
--- a/overview.rb
+++ b/overview.rb
@@ -28,20 +28,27 @@ $d = Dudle.new
 $d.wizzard_redirect
 
 
-$d << _("The link to your poll is:")
+$d << _("The next steps are:")
 
 mailstr = _("Send this link via email...")
-nextstr = _("To the Vote interface")
+nextstr = _("Visit the poll yourself:")
 subjectstr = _("Link to dudle poll about %{polltitle}") % {:polltitle => $d.title}
 
 $d << <<END
-<pre id="humanReadableURL">#{$conf.siteurl}</pre>
-<a id="mailtoURL" href='mailto:?subject=#{CGI.escapeHTML(CGI.escape(subjectstr).gsub("+","%20"))}&amp;body=#{$conf.siteurl}'>#{mailstr}</a>
-<form id='clickURL' method='get' action='.'>
-	<div style='margin-top:1ex'>
-		<input type='submit' value='#{nextstr}' />
-	</div>
-</form>
+<ol>
+	<li>
+		Send the link to all participants:
+		<ul>
+			<li><input id="humanReadableURL" value="#{$conf.siteurl}" type="text" size="80" readonly="readonly"></li>
+			<li><a id="mailtoURL" href='mailto:?subject=#{CGI.escapeHTML(CGI.escape(subjectstr).gsub("+","%20"))}&amp;body=#{$conf.siteurl}'>#{mailstr}</a></li>
+		</ul>
+	</li>
+	<li>
+		#{nextstr}
+		<ul>
+			<li><a href="#{$conf.siteurl}">#{$conf.siteurl}</a></li>
+		</ul>
+	</ol>
 END
 
 $d.out
diff --git a/pollhead.rb b/pollhead.rb
index 82327e5..732f300 100644
--- a/pollhead.rb
+++ b/pollhead.rb
@@ -68,8 +68,8 @@ SORTSYMBOL
 			ret += "#{CGI.escapeHTML(columntitle)}"
 			ret += "#{sortsymb(scols,columntitle)}</a>" unless showeditbuttons
 			if showeditbuttons
-				editstr = _("Edit column")
-				deletestr = _("Delete column")
+				editstr = _("Edit Option")
+				deletestr = _("Delete Option")
 				ret += <<EDITDELETE
 <form method='post' action=''>
 	<div class='editdelete'>
@@ -96,11 +96,11 @@ EDITDELETE
 			title = CGI.escapeHTML(title)
 			hiddeninput = "<input type='hidden' name='columnid' value=\"#{title}\" />"
 		end
-		columntitlestr = _("Alternative")
+		columntitlestr = _("Option")
 		descriptionstr = _("Description (optional)")
-		addeditstr = _("Add/Edit Column")
+		addeditstr = _("Add/Edit Option")
 		previewstr = _("Preview")
-		hint = _("Enter all alternatives (columns), you want to ask the participants of the poll. The participants will state one vote for every alternative you give here separately.")
+		hint = _("Enter all Options (columns), you want to ask the participants of the poll. The participants will state one vote for every option you give here separately.")
 		ret = <<END
 <form method='post' action='' accept-charset='utf-8'>
 	<div class='textcolumn'>#{hint}</div>