1.1 --- a/model/issue.lua	Sat Mar 09 19:19:44 2013 +0100
     1.2 +++ b/model/issue.lua	Sat Mar 09 19:31:33 2013 +0100
     1.3 @@ -193,12 +193,12 @@
     1.4      discussion = _"Discussion",
     1.5      verification = _"Frozen",
     1.6      voting = _"Voting",
     1.7 -    canceled_revoked_before_accepted = _"Cancelled (before accepted due to revocation)",
     1.8 -    canceled_issue_not_accepted = _"Cancelled (issue not accepted)",
     1.9 -    canceled_after_revocation_during_discussion = _"Cancelled (during discussion due to revocation)",
    1.10 -    canceled_after_revocation_during_verification = _"Cancelled (during verification due to revocation)",
    1.11 +    canceled_revoked_before_accepted = _"Canceled (before accepted due to revocation)",
    1.12 +    canceled_issue_not_accepted = _"Canceled (issue not accepted)",
    1.13 +    canceled_after_revocation_during_discussion = _"Canceled (during discussion due to revocation)",
    1.14 +    canceled_after_revocation_during_verification = _"Canceled (during verification due to revocation)",
    1.15      calculation = _"Calculation",
    1.16 -    canceled_no_initiative_admitted = _"Cancelled (no initiative admitted)",
    1.17 +    canceled_no_initiative_admitted = _"Canceled (no initiative admitted)",
    1.18      finished_without_winner = _"Finished (without winner)",
    1.19      finished_with_winner = _"Finished (with winner)"
    1.20    }
    1.21 @@ -246,7 +246,7 @@
    1.22      initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL")
    1.23    elseif state == "finished" then
    1.24      initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.closed NOTNULL")
    1.25 -  elseif state == "cancelled" then
    1.26 +  elseif state == "canceled" then
    1.27      initiatives_selector:add_where("issue.fully_frozen ISNULL AND issue.closed NOTNULL")
    1.28    else
    1.29      error("Invalid state")