Several bugfixes and feature improvements

git-svn-id: https://svn.roundcube.net/trunk@21 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 7 insertions, 6 deletions

diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc
index 60b1056dd..4e1e345fa 100644
--- a/roundcubemail/program/steps/settings/func.inc
+++ b/roundcubemail/program/steps/settings/func.inc
@@ -57,12 +57,13 @@ function rcmail_user_prefs_form($attrib)
   $select_lang->add('Deutsch', 'de');
   $select_lang->add('English', 'en');
   $select_lang->add('Espanol', 'es');
-  $select_lang->add('Fran¨ais', 'fr');
+  $select_lang->add('Français', 'fr');
   $select_lang->add('Italiano', 'it');
+  $select_lang->add('Nederlands', 'nl');
 
   $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                   $field_id,
-                  rcube_label('language'),
+                  rep_specialchars_output(rcube_label('language')),
                   $select_lang->show($sess_user_lang));
 
 
@@ -99,7 +100,7 @@ function rcmail_user_prefs_form($attrib)
   
   $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                   $field_id,
-                  rcube_label('timezone'),
+                  rep_specialchars_output(rcube_label('timezone')),
                   $select_timezone->show($CONFIG['timezone']));
 
 
@@ -109,7 +110,7 @@ function rcmail_user_prefs_form($attrib)
 
   $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                   $field_id,
-                  rcube_label('pagesize'),
+                  rep_specialchars_output(rcube_label('pagesize')),
                   $input_pagesize->show($CONFIG['pagesize']));
 
   // show checkbox for HTML/plaintext messages
@@ -118,7 +119,7 @@ function rcmail_user_prefs_form($attrib)
 
   $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                   $field_id,
-                  rcube_label('preferhtml'),
+                  rep_specialchars_output(rcube_label('preferhtml')),
                   $input_pagesize->show($CONFIG['prefer_html']?1:0));
 
   // MM: Show checkbox for toggling 'pretty dates' 
@@ -127,7 +128,7 @@ function rcmail_user_prefs_form($attrib)
 
   $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                   $field_id,
-                  rcube_label('prettydate'),
+                  rep_specialchars_output(rcube_label('prettydate')),
                   $input_prettydate->show($CONFIG['prettydate']?1:0));