From: Thomas Hochstein <thh@inter.net>
Date: Wed, 19 Mar 2014 21:15:36 +0000 (+0100)
Subject: Merge branch 'thh-pickfromupstream' into next
X-Git-Url: https://code.th-h.de/?p=usenet%2Fusevote.git;a=commitdiff_plain;h=7233d81f302404ac9f842127ccf8d268d6df0cb2;hp=ef9dd9e761e4b44349f2eec75287917d7b652742

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 --git a/UVconfig.pm b/UVconfig.pm
index 4cd5d85..c2a1629 100644
--- a/UVconfig.pm
+++ b/UVconfig.pm
@@ -92,8 +92,9 @@ sub read_config {
              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',
@@ -120,6 +121,7 @@ sub read_config {
              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:',