1.1 --- a/app/main/issue/_list.lua	Sun Mar 11 13:04:43 2012 +0100
     1.2 +++ b/app/main/issue/_list.lua	Sun Mar 11 13:30:13 2012 +0100
     1.3 @@ -148,7 +148,15 @@
     1.4                    if issue.state_time_left then
     1.5                      slot.put(" · ")
     1.6                      if issue.state_time_left:sub(1,1) == "-" then
     1.7 -                      ui.tag{ content = _("Counting starts soon") }
     1.8 +                      if issue.state == "new" then
     1.9 +                        ui.tag{ content = _("Discussion starts soon") }
    1.10 +                      elseif issue.state == "discussion" then
    1.11 +                        ui.tag{ content = _("Verification starts soon") }
    1.12 +                      elseif issue.state == "frozen" then
    1.13 +                        ui.tag{ content = _("Voting starts soon") }
    1.14 +                      elseif issue.state == "voting" then
    1.15 +                        ui.tag{ content = _("Counting starts soon") }
    1.16 +                      end
    1.17                      else
    1.18                        ui.tag{ content = _("#{time_left} left", { time_left = issue.state_time_left:gsub("days", _"days"):gsub("day", _"day") }) }
    1.19                      end

     2.1 --- a/app/main/issue/_show_head.lua	Sun Mar 11 13:04:43 2012 +0100
     2.2 +++ b/app/main/issue/_show_head.lua	Sun Mar 11 13:30:13 2012 +0100
     2.3 @@ -56,11 +56,21 @@
     2.4  
     2.5        if issue.state_time_left then
     2.6          slot.put(" · ")
     2.7 -        ui.tag{ content = _("#{time_left} left", { 
     2.8 -          time_left = issue.state_time_left:gsub("days", _"days"):gsub("day", _"day")
     2.9 -        }) }
    2.10 +        if issue.state_time_left:sub(1,1) == "-" then
    2.11 +          if issue.state == "new" then
    2.12 +            ui.tag{ content = _("Discussion starts soon") }
    2.13 +          elseif issue.state == "discussion" then
    2.14 +            ui.tag{ content = _("Verification starts soon") }
    2.15 +          elseif issue.state == "frozen" then
    2.16 +            ui.tag{ content = _("Voting starts soon") }
    2.17 +          elseif issue.state == "voting" then
    2.18 +            ui.tag{ content = _("Counting starts soon") }
    2.19 +          end
    2.20 +        else
    2.21 +          ui.tag{ content = _("#{time_left} left", { time_left = issue.state_time_left:gsub("days", _"days"):gsub("day", _"day") }) }
    2.22 +        end
    2.23        end
    2.24 -
    2.25 +      
    2.26      end
    2.27    }
    2.28  

     3.1 --- a/locale/translations.de.lua	Sun Mar 11 13:04:43 2012 +0100
     3.2 +++ b/locale/translations.de.lua	Sun Mar 11 13:30:13 2012 +0100
     3.3 @@ -180,6 +180,7 @@
     3.4  ["Discussion URL"] = "Diskussions-URL";
     3.5  ["Discussion on issue"] = "Diskussion zum Thema";
     3.6  ["Discussion started"] = "Diskussion gestartet";
     3.7 +["Discussion starts soon"] = "Diskussion startet in Kürze";
     3.8  ["Discussion time"] = "Zeit für die Diskussion";
     3.9  ["Discussion with initiators"] = "Diskussion mit den Initiatoren";
    3.10  ["Discussion, frozen and voting phase"] = "Diskussions-, Eingefroren- und Abstimmphase";
    3.11 @@ -314,7 +315,6 @@
    3.12  ["Locked?"] = "Gesperrt?";
    3.13  ["Login"] = "Anmeldung";
    3.14  ["Login name"] = "Anmeldename";
    3.15 -["Login successful!"] = "Anmeldung erfolgreich";
    3.16  ["Logout"] = "Abmelden";
    3.17  ["Logout successful"] = "Abmeldung erfolgreich";
    3.18  ["Manage filter"] = "Filter verwalten";
    3.19 @@ -605,8 +605,9 @@
    3.20  ["Updated drafts"] = "Neue Entwürfe";
    3.21  ["Upload images"] = "Bilder hochladen";
    3.22  ["Usage terms"] = "Nutzungsbedingungen";
    3.23 -["Verification started"] = "Phase Überprüfung gestartet";
    3.24 -["Verification time"] = "Zeit für die Überprüfung";
    3.25 +["Verification started"] = "Phase Eingefroren gestartet";
    3.26 +["Verification starts soon"] = "Phase Eingefroren startet in Kürze";
    3.27 +["Verification time"] = "Zeit für Eingefroren";
    3.28  ["Version"] = "Version";
    3.29  ["Vote now"] = "Jetzt abstimmen";
    3.30  ["Voted"] = "Abgestimmt";
    3.31 @@ -623,6 +624,7 @@
    3.32  ["Voting privileges"] = "Abstimmberechtigung";
    3.33  ["Voting proposal"] = "Abstimmungsvorlage";
    3.34  ["Voting started"] = "Abstimmung begonnen";
    3.35 +["Voting starts soon"] = "Abstimmung beginnt in Kürze";
    3.36  ["Voting time"] = "Zeit für die Abstimmung";
    3.37  ["We couldn't deliver a confirmation mail to this address. Please check entered email address."] = "Wir konnten keine Bestätigungs-E-Mail versenden. Bitte überprüfe die E-Mail-Adresse.";
    3.38  ["We have sent an email with activation link already in the last hour. Please try again later."] = "Wir haben bereits innerhalb der letzten Stunde eine E-Mail mit Bestätigungslink gesendet. Bitte versuche es später erneut.";