Merge branch 'thh-pickfromupstream' into next

* thh-pickfromupstream:
  Fix whitespace and typo.
  Update documentation to 4.12.
  Add correct timestamp to mbox when processing.
  Don't remove empty mailbox files/maildirs.
  Fix UVreadmail.pm
  Add option to compare ballot to sample ballot.
  Documentation: Add votename to UVmenu.

diff --combined UVconfig.pm
index 4cad06f,4cd5d85..c2a1629
--- 1/UVconfig.pm
--- 2/UVconfig.pm
+++ b/UVconfig.pm
@@@ -18,7 -18,7 +18,7 @@@ require Exporter
  $VERSION = "0.18";
  
  # Usevote version
- $usevote_version = "UseVoteGer 4.11";
+ $usevote_version = "UseVoteGer 4.12";
  
  sub read_config {
  
@@@ -27,6 -27,7 +27,7 @@@
    # Default configuration options (overwritten in usevote.cfg)
    %config = (votefile             => "votes",
               votename             => "unkonfiguriertes Usevote",
+              sampleballotfile     => "ballot.sample",
               resultfile           => "ergebnis.alle",
               rulefile             => "usevote.rul",
               badaddrfile          => "mailpatterns.cfg",
@@@ -57,6 -58,7 +58,7 @@@
               mailcc               => "",
               sleepcmd             => "sleep 1",
               clearcmd             => "clear",
+              diff                 => "diff",
               pager                => "less",
               pop3                 => 0,
               pop3server           => "localhost",
@@@ -90,9 -92,8 +92,9 @@@
               nein_stimme          => '(N\s*E\s*I\s*N|N|(D\s*A\s*)?G\s*E\s*G\s*E\s*N)',
               enth_stimme          => '(E|E\s*N\s*T\s*H\s*A\s*L\s*T\s*U\s*N\s*G)',
               ann_stimme           => 'A\s*N\s*N\s*U\s*L\s*L\s*I\s*E\s*R\s*U\s*N\s*G',
 +             bdsg_confirm         => 'JA',
               condition1           => '$yes>=2*$no', # twice as many yes as no
 -             condition2           => '$yes>=60',    # min 60 yes votes
 +             condition2           => '$yes>=50',    # min 50 yes votes
               prop_formula         => '$yes/$no',
               tpl_ack_mail         => 'ack-mail',
               tpl_bouncelist       => 'bouncelist',
@@@ -119,7 -120,6 +121,7 @@@
               tpl_rule_violated    => 'rule-violated',
               begin_divider        => 'Alles vor dieser Zeile bitte loeschen',
               end_divider          => 'Alles nach dieser Zeile bitte loeschen',
 +             ballotintro          => 'WAHLSCHEIN fuer',
               nametext             => 'Dein Realname, falls nicht im FROM-Header:',
               nametext2            => 'Waehlername:',
               addresstext          => 'Waehleradresse:',