liquid_feedback_frontend
changeset 973:8d5b214889c3
Globally changed "cancelled"(BE) to "canceled"(AE)
line diff
1.1 --- a/app/main/area/_list.lua Sat Mar 09 19:19:44 2013 +0100 1.2 +++ b/app/main/area/_list.lua Sat Mar 09 19:31:33 2013 +0100 1.3 @@ -14,7 +14,7 @@ 1.4 :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL AND issue.closed ISNULL)", "issues_frozen_count") 1.5 :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL)", "issues_voting_count") 1.6 :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed NOTNULL)", "issues_finished_count") 1.7 - :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_cancelled_count") 1.8 + :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_canceled_count") 1.9 1.10 if app.session.member_id then 1.11 areas_selector
2.1 --- a/app/main/area/_list_entry.lua Sat Mar 09 19:19:44 2013 +0100 2.2 +++ b/app/main/area/_list_entry.lua Sat Mar 09 19:31:33 2013 +0100 2.3 @@ -34,8 +34,8 @@ 2.4 } 2.5 slot.put(" · ") 2.6 ui.link{ 2.7 - module = "area", view = "show", id = area.id, params = { tab = "closed", filter = "cancelled" }, 2.8 - text = _("#{count} cancelled", { count = area.issues_cancelled_count }) 2.9 + module = "area", view = "show", id = area.id, params = { tab = "closed", filter = "canceled" }, 2.10 + text = _("#{count} canceled", { count = area.issues_canceled_count }) 2.11 } 2.12 end } 2.13
3.1 --- a/app/main/index/_member_home.lua Sat Mar 09 19:19:44 2013 +0100 3.2 +++ b/app/main/index/_member_home.lua Sat Mar 09 19:31:33 2013 +0100 3.3 @@ -61,7 +61,7 @@ 3.4 :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL AND issue.closed ISNULL)", "issues_frozen_count") 3.5 :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL)", "issues_voting_count") 3.6 :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed NOTNULL)", "issues_finished_count") 3.7 - :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_cancelled_count") 3.8 + :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_canceled_count") 3.9 :add_where{ "area.unit_id = ?", unit.id } 3.10 :add_where{ "area.active" } 3.11 :add_order_by("area.name")
4.1 --- a/app/main/issue/_filters.lua Sat Mar 09 19:19:44 2013 +0100 4.2 +++ b/app/main/issue/_filters.lua Sat Mar 09 19:31:33 2013 +0100 4.3 @@ -93,8 +93,8 @@ 4.4 end 4.5 } 4.6 filter[#filter+1] = { 4.7 - name = "cancelled", 4.8 - label = _"Cancelled", 4.9 + name = "canceled", 4.10 + label = _"Canceled", 4.11 selector_modifier = function(selector) 4.12 4.13 if for_events then 4.14 @@ -147,8 +147,8 @@ 4.15 end 4.16 } 4.17 filter[#filter+1] = { 4.18 - name = "cancelled", 4.19 - label = _"Cancelled", 4.20 + name = "canceled", 4.21 + label = _"Canceled", 4.22 selector_modifier = function(selector) 4.23 if for_events then 4.24 selector:add_where("event.state NOT IN ('finished_with_winner', 'finished_without_winner')")
5.1 --- a/app/main/issue/_show.lua Sat Mar 09 19:19:44 2013 +0100 5.2 +++ b/app/main/issue/_show.lua Sat Mar 09 19:31:33 2013 +0100 5.3 @@ -254,12 +254,12 @@ 5.4 local policy = issue.policy 5.5 ui.container{ 5.6 attr = { class = "not_admitted_info" }, 5.7 - content = _("This issue has been cancelled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) }) 5.8 + content = _("This issue has been canceled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) }) 5.9 } 5.10 elseif issue.state:sub(1, #("canceled_")) == "canceled_" then 5.11 ui.container{ 5.12 attr = { class = "not_admitted_info" }, 5.13 - content = _("This issue has been cancelled.") 5.14 + content = _("This issue has been canceled.") 5.15 } 5.16 end 5.17 end
6.1 --- a/locale/translations.de.lua Sat Mar 09 19:19:44 2013 +0100 6.2 +++ b/locale/translations.de.lua Sat Mar 09 19:31:33 2013 +0100 6.3 @@ -1,6 +1,6 @@ 6.4 #!/usr/bin/env lua 6.5 return { 6.6 -["#{count} cancelled"] = "#{count} abgebrochen"; 6.7 +["#{count} canceled"] = "#{count} abgebrochen"; 6.8 ["#{count} days ago"] = "vor #{count} Tagen"; 6.9 ["#{count} finished"] = "#{count} abgeschlossen"; 6.10 ["#{count} in discussion"] = "#{count} in Diskussion"; 6.11 @@ -101,12 +101,12 @@ 6.12 ["Cancel password reset"] = "Kennwort-Rücksetzung abbrechen"; 6.13 ["Cancel refuse of invitation"] = "Ablehnung der Einladung aufheben"; 6.14 ["Cancel registration"] = "Registrierung abbrechen"; 6.15 -["Cancelled"] = "Abgebrochen"; 6.16 -["Cancelled (before accepted due to revocation)"] = "Abgebrochen (in Neu-Phase, wegen Rückzug)"; 6.17 -["Cancelled (during discussion due to revocation)"] = "Abgebrochen (während Diskussion, wegen Rückzug)"; 6.18 -["Cancelled (during verification due to revocation)"] = "Abgebrochen (während Eingefroren-Phase, wegen Rückzug)"; 6.19 -["Cancelled (issue not accepted)"] = "Abgebrochen (Thema nicht akzeptiert)"; 6.20 -["Cancelled (no initiative admitted)"] = "Abgebrochen (Keine Initiative zugelassen)"; 6.21 +["Canceled"] = "Abgebrochen"; 6.22 +["Canceled (before accepted due to revocation)"] = "Abgebrochen (in Neu-Phase, wegen Rückzug)"; 6.23 +["Canceled (during discussion due to revocation)"] = "Abgebrochen (während Diskussion, wegen Rückzug)"; 6.24 +["Canceled (during verification due to revocation)"] = "Abgebrochen (während Eingefroren-Phase, wegen Rückzug)"; 6.25 +["Canceled (issue not accepted)"] = "Abgebrochen (Thema nicht akzeptiert)"; 6.26 +["Canceled (no initiative admitted)"] = "Abgebrochen (Keine Initiative zugelassen)"; 6.27 ["Change area delegation"] = "Delegation für Themenbereich ändern"; 6.28 ["Change email"] = "E-Mail-Adresse ändern"; 6.29 ["Change email address"] = "E-Mail-Adresse ändern"; 6.30 @@ -577,7 +577,7 @@ 6.31 ["This initiative is already revoked"] = "Diese Initiative ist schon zurückgezogen"; 6.32 ["This initiative is revoked"] = "Diese Initiative wurde zurückgezogen"; 6.33 ["This invite key is connected with the following information:"] = "Dieser Einladungscode ist mit den folgenden Daten verknüpft:"; 6.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Dieses Thema wurde abgebrochen. Es hat das Quorum von #{quorum} nicht erfüllt."; 6.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Dieses Thema wurde abgebrochen. Es hat das Quorum von #{quorum} nicht erfüllt."; 6.36 ["This issue is already closed."] = "Das Thema ist schon geschlossen."; 6.37 ["This issue is already frozen."] = "Das Thema ist schon eingefroren"; 6.38 ["This login is already taken, please choose another one!"] = "Dieser Anmeldename ist bereits vergeben, bitte wähle einen anderen!";
7.1 --- a/locale/translations.el.lua Sat Mar 09 19:19:44 2013 +0100 7.2 +++ b/locale/translations.el.lua Sat Mar 09 19:31:33 2013 +0100 7.3 @@ -1,6 +1,6 @@ 7.4 #!/usr/bin/env lua 7.5 return { 7.6 -["#{count} cancelled"] = "#{count} ακυρώθηκαν"; 7.7 +["#{count} canceled"] = "#{count} ακυρώθηκαν"; 7.8 ["#{count} days ago"] = "#{count} μέρες πριν"; 7.9 ["#{count} finished"] = "#{count} ολοκληρώθηκαν"; 7.10 ["#{count} in discussion"] = "#{count} σε διαβούλευση"; 7.11 @@ -101,12 +101,12 @@ 7.12 ["Cancel password reset"] = "Ακύρωση επαναφοράς κωδικού πρόσβασης"; 7.13 ["Cancel refuse of invitation"] = "Ακύρωση απόρριψης της πρόσκλησης"; 7.14 ["Cancel registration"] = "Ακύρωση εγγραφής"; 7.15 -["Cancelled"] = "Ακυρώθηκε"; 7.16 -["Cancelled (before accepted due to revocation)"] = "Ακυρώθηκε (στη φάση 'Νέο', λόγω ανάκλησης)"; 7.17 -["Cancelled (during discussion due to revocation)"] = "Ακυρώθηκε (κατά τη διάρκεια της συζήτησης, λόγω ανάκλησης)"; 7.18 -["Cancelled (during verification due to revocation)"] = "Ακυρώθηκε (κατά τη διάρκεια της επιβεβαίωσης, λόγω ανάκλησης)"; 7.19 -["Cancelled (issue not accepted)"] = "Ακυρώθηκε (Δεν έγινε δεκτό)"; 7.20 -["Cancelled (no initiative admitted)"] = "Ακυρώθηκε (Δεν προκρίθηκε καμία πρωτοβουλία)"; 7.21 +["Canceled"] = "Ακυρώθηκε"; 7.22 +["Canceled (before accepted due to revocation)"] = "Ακυρώθηκε (στη φάση 'Νέο', λόγω ανάκλησης)"; 7.23 +["Canceled (during discussion due to revocation)"] = "Ακυρώθηκε (κατά τη διάρκεια της συζήτησης, λόγω ανάκλησης)"; 7.24 +["Canceled (during verification due to revocation)"] = "Ακυρώθηκε (κατά τη διάρκεια της επιβεβαίωσης, λόγω ανάκλησης)"; 7.25 +["Canceled (issue not accepted)"] = "Ακυρώθηκε (Δεν έγινε δεκτό)"; 7.26 +["Canceled (no initiative admitted)"] = "Ακυρώθηκε (Δεν προκρίθηκε καμία πρωτοβουλία)"; 7.27 ["Change area delegation"] = "Αλλαγή ανάθεσης για τον τομέα"; 7.28 ["Change email"] = "Αλλαγή email"; 7.29 ["Change email address"] = "Αλλαγή διεύθυνσης email"; 7.30 @@ -577,7 +577,7 @@ 7.31 ["This initiative is already revoked"] = "Αυτή η πρωτοβουλία έχει ήδη ανακληθεί"; 7.32 ["This initiative is revoked"] = "Αυτή η πρωτοβουλία έχει ανακληθεί"; 7.33 ["This invite key is connected with the following information:"] = "Αυτός ο κωδικός πρόσκλησης σχετίζεται με τα ακόλουθα στοιχεία:"; 7.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Αυτό το θέμα έχει ακυρωθεί. Δεν είχε την απαιτούμενη απαρτία #{quorum}"; 7.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Αυτό το θέμα έχει ακυρωθεί. Δεν είχε την απαιτούμενη απαρτία #{quorum}"; 7.36 ["This issue is already closed."] = "Αυτό το θέμα έχει ήδη κλείσει."; 7.37 ["This issue is already frozen."] = "Αυτό το θέμα έχει ήδη παγώσει."; 7.38 ["This login is already taken, please choose another one!"] = "Αυτό το όνομα σύνδεσης υπάρχει ήδη, παρακαλώ επιλέξτε κάποιο άλλο!";
8.1 --- a/locale/translations.en.lua Sat Mar 09 19:19:44 2013 +0100 8.2 +++ b/locale/translations.en.lua Sat Mar 09 19:31:33 2013 +0100 8.3 @@ -1,6 +1,6 @@ 8.4 #!/usr/bin/env lua 8.5 return { 8.6 -["#{count} cancelled"] = false; 8.7 +["#{count} canceled"] = false; 8.8 ["#{count} days ago"] = false; 8.9 ["#{count} finished"] = false; 8.10 ["#{count} in discussion"] = false; 8.11 @@ -101,12 +101,12 @@ 8.12 ["Cancel password reset"] = false; 8.13 ["Cancel refuse of invitation"] = false; 8.14 ["Cancel registration"] = false; 8.15 -["Cancelled"] = false; 8.16 -["Cancelled (before accepted due to revocation)"] = false; 8.17 -["Cancelled (during discussion due to revocation)"] = false; 8.18 -["Cancelled (during verification due to revocation)"] = false; 8.19 -["Cancelled (issue not accepted)"] = false; 8.20 -["Cancelled (no initiative admitted)"] = false; 8.21 +["Canceled"] = false; 8.22 +["Canceled (before accepted due to revocation)"] = false; 8.23 +["Canceled (during discussion due to revocation)"] = false; 8.24 +["Canceled (during verification due to revocation)"] = false; 8.25 +["Canceled (issue not accepted)"] = false; 8.26 +["Canceled (no initiative admitted)"] = false; 8.27 ["Change area delegation"] = false; 8.28 ["Change email"] = false; 8.29 ["Change email address"] = false; 8.30 @@ -577,7 +577,7 @@ 8.31 ["This initiative is already revoked"] = false; 8.32 ["This initiative is revoked"] = false; 8.33 ["This invite key is connected with the following information:"] = false; 8.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = false; 8.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = false; 8.36 ["This issue is already closed."] = false; 8.37 ["This issue is already frozen."] = false; 8.38 ["This login is already taken, please choose another one!"] = false;
9.1 --- a/locale/translations.eo.lua Sat Mar 09 19:19:44 2013 +0100 9.2 +++ b/locale/translations.eo.lua Sat Mar 09 19:31:33 2013 +0100 9.3 @@ -1,6 +1,6 @@ 9.4 #!/usr/bin/env lua 9.5 return { 9.6 -["#{count} cancelled"] = false; 9.7 +["#{count} canceled"] = false; 9.8 ["#{count} days ago"] = false; 9.9 ["#{count} finished"] = false; 9.10 ["#{count} in discussion"] = false; 9.11 @@ -101,12 +101,12 @@ 9.12 ["Cancel password reset"] = "Nuligi pasvortoremeton"; 9.13 ["Cancel refuse of invitation"] = "Nuligi rifuzon de la invito"; 9.14 ["Cancel registration"] = "Nuligi registradon"; 9.15 -["Cancelled"] = "Abolita"; 9.16 -["Cancelled (before accepted due to revocation)"] = false; 9.17 -["Cancelled (during discussion due to revocation)"] = false; 9.18 -["Cancelled (during verification due to revocation)"] = false; 9.19 -["Cancelled (issue not accepted)"] = false; 9.20 -["Cancelled (no initiative admitted)"] = false; 9.21 +["Canceled"] = "Abolita"; 9.22 +["Canceled (before accepted due to revocation)"] = false; 9.23 +["Canceled (during discussion due to revocation)"] = false; 9.24 +["Canceled (during verification due to revocation)"] = false; 9.25 +["Canceled (issue not accepted)"] = false; 9.26 +["Canceled (no initiative admitted)"] = false; 9.27 ["Change area delegation"] = "Ŝanĝi delegacion por temaro"; 9.28 ["Change email"] = "Ŝanĝi retpoŝton"; 9.29 ["Change email address"] = "Ŝanĝi retpoŝtadreson"; 9.30 @@ -577,7 +577,7 @@ 9.31 ["This initiative is already revoked"] = "Tiu iniciato estas jam nuligita"; 9.32 ["This initiative is revoked"] = "Tiu iniciato estas nuligita"; 9.33 ["This invite key is connected with the following information:"] = false; 9.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Tiu temo estas abolita. Ĝi malsukcesis la kvorumon de #{quorum}."; 9.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Tiu temo estas abolita. Ĝi malsukcesis la kvorumon de #{quorum}."; 9.36 ["This issue is already closed."] = "La temo estas jam fermita."; 9.37 ["This issue is already frozen."] = "La temo estas jam ĝelita"; 9.38 ["This login is already taken, please choose another one!"] = "Tiu salutnomo estas jam prenita, bonvolu elekti alian!";
10.1 --- a/locale/translations.fr.lua Sat Mar 09 19:19:44 2013 +0100 10.2 +++ b/locale/translations.fr.lua Sat Mar 09 19:31:33 2013 +0100 10.3 @@ -1,6 +1,6 @@ 10.4 #!/usr/bin/env lua 10.5 return { 10.6 -["#{count} cancelled"] = false; 10.7 +["#{count} canceled"] = false; 10.8 ["#{count} days ago"] = false; 10.9 ["#{count} finished"] = false; 10.10 ["#{count} in discussion"] = false; 10.11 @@ -101,12 +101,12 @@ 10.12 ["Cancel password reset"] = false; 10.13 ["Cancel refuse of invitation"] = false; 10.14 ["Cancel registration"] = false; 10.15 -["Cancelled"] = false; 10.16 -["Cancelled (before accepted due to revocation)"] = false; 10.17 -["Cancelled (during discussion due to revocation)"] = false; 10.18 -["Cancelled (during verification due to revocation)"] = false; 10.19 -["Cancelled (issue not accepted)"] = false; 10.20 -["Cancelled (no initiative admitted)"] = false; 10.21 +["Canceled"] = false; 10.22 +["Canceled (before accepted due to revocation)"] = false; 10.23 +["Canceled (during discussion due to revocation)"] = false; 10.24 +["Canceled (during verification due to revocation)"] = false; 10.25 +["Canceled (issue not accepted)"] = false; 10.26 +["Canceled (no initiative admitted)"] = false; 10.27 ["Change area delegation"] = false; 10.28 ["Change email"] = false; 10.29 ["Change email address"] = false; 10.30 @@ -577,7 +577,7 @@ 10.31 ["This initiative is already revoked"] = false; 10.32 ["This initiative is revoked"] = false; 10.33 ["This invite key is connected with the following information:"] = false; 10.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = false; 10.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = false; 10.36 ["This issue is already closed."] = false; 10.37 ["This issue is already frozen."] = false; 10.38 ["This login is already taken, please choose another one!"] = false;
11.1 --- a/locale/translations.hu.lua Sat Mar 09 19:19:44 2013 +0100 11.2 +++ b/locale/translations.hu.lua Sat Mar 09 19:31:33 2013 +0100 11.3 @@ -1,6 +1,6 @@ 11.4 #!/usr/bin/env lua 11.5 return { 11.6 -["#{count} cancelled"] = false; 11.7 +["#{count} canceled"] = false; 11.8 ["#{count} days ago"] = "#{count} nappal ezelõtt"; 11.9 ["#{count} finished"] = false; 11.10 ["#{count} in discussion"] = false; 11.11 @@ -101,12 +101,12 @@ 11.12 ["Cancel password reset"] = "Jelszóvisszaállítás megszakítása"; 11.13 ["Cancel refuse of invitation"] = "Meghívás elutasításának megszakítása"; 11.14 ["Cancel registration"] = "Regisztrálás megszakítása"; 11.15 -["Cancelled"] = "Megszakítva"; 11.16 -["Cancelled (before accepted due to revocation)"] = "Megszakítva (elfogadás elõtt, visszavonás miatt)"; 11.17 -["Cancelled (during discussion due to revocation)"] = "Megszakítva (tárgyalás közben, visszavonás miatt)"; 11.18 -["Cancelled (during verification due to revocation)"] = "Megszakítva (ellenõrzés közben, visszavonás miatt)"; 11.19 -["Cancelled (issue not accepted)"] = "Megszakítva (el nem fogadott téma)"; 11.20 -["Cancelled (no initiative admitted)"] = "Megszakítva (nem engedélyezett kezdeményezés)"; 11.21 +["Canceled"] = "Megszakítva"; 11.22 +["Canceled (before accepted due to revocation)"] = "Megszakítva (elfogadás elõtt, visszavonás miatt)"; 11.23 +["Canceled (during discussion due to revocation)"] = "Megszakítva (tárgyalás közben, visszavonás miatt)"; 11.24 +["Canceled (during verification due to revocation)"] = "Megszakítva (ellenõrzés közben, visszavonás miatt)"; 11.25 +["Canceled (issue not accepted)"] = "Megszakítva (el nem fogadott téma)"; 11.26 +["Canceled (no initiative admitted)"] = "Megszakítva (nem engedélyezett kezdeményezés)"; 11.27 ["Change area delegation"] = "Témakör-delegáció módosítása"; 11.28 ["Change email"] = "Email-cím módosítása"; 11.29 ["Change email address"] = "Email-cím módosítása"; 11.30 @@ -577,7 +577,7 @@ 11.31 ["This initiative is already revoked"] = "Ezt a kezdeményezést már visszavonták"; 11.32 ["This initiative is revoked"] = "Ezt a kezdeményezést visszavonták"; 11.33 ["This invite key is connected with the following information:"] = "Ehhez a meghívókulcshoz a következõ adatok kapcsolódnak:"; 11.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Téma megszakítva. Nincs meg a határozatképesség: #(quorum)."; 11.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Téma megszakítva. Nincs meg a határozatképesség: #(quorum)."; 11.36 ["This issue is already closed."] = "Téma már lezárva."; 11.37 ["This issue is already frozen."] = "Téma már befagyasztva."; 11.38 ["This login is already taken, please choose another one!"] = "Ez a bejelentkezési név más foglalt, válassz másikat!";
12.1 --- a/locale/translations.it.lua Sat Mar 09 19:19:44 2013 +0100 12.2 +++ b/locale/translations.it.lua Sat Mar 09 19:31:33 2013 +0100 12.3 @@ -1,6 +1,6 @@ 12.4 #!/usr/bin/env lua 12.5 return { 12.6 -["#{count} cancelled"] = "#{count} annullati"; 12.7 +["#{count} canceled"] = "#{count} annullati"; 12.8 ["#{count} days ago"] = "#{count} giorni fa"; 12.9 ["#{count} finished"] = "#{count} terminati"; 12.10 ["#{count} in discussion"] = "#{count} discussione in corso"; 12.11 @@ -101,12 +101,12 @@ 12.12 ["Cancel password reset"] = "Annulla il ripristino della password"; 12.13 ["Cancel refuse of invitation"] = "Annulla il rifiuto all'invito"; 12.14 ["Cancel registration"] = "Annulla la registrazione"; 12.15 -["Cancelled"] = "Annullato"; 12.16 -["Cancelled (before accepted due to revocation)"] = "Annullato (revocato prima dell'approvazione)"; 12.17 -["Cancelled (during discussion due to revocation)"] = "Annullato (revocato durante la discussione)"; 12.18 -["Cancelled (during verification due to revocation)"] = "Annullato (revocato durante la verifica)"; 12.19 -["Cancelled (issue not accepted)"] = "Annullato (tematica non approvata)"; 12.20 -["Cancelled (no initiative admitted)"] = "Annullato (nessuna iniziativa ammessa)"; 12.21 +["Canceled"] = "Annullato"; 12.22 +["Canceled (before accepted due to revocation)"] = "Annullato (revocato prima dell'approvazione)"; 12.23 +["Canceled (during discussion due to revocation)"] = "Annullato (revocato durante la discussione)"; 12.24 +["Canceled (during verification due to revocation)"] = "Annullato (revocato durante la verifica)"; 12.25 +["Canceled (issue not accepted)"] = "Annullato (tematica non approvata)"; 12.26 +["Canceled (no initiative admitted)"] = "Annullato (nessuna iniziativa ammessa)"; 12.27 ["Change area delegation"] = "Cambia la delega per l'area"; 12.28 ["Change email"] = "Cambia email"; 12.29 ["Change email address"] = "Cambia email"; 12.30 @@ -577,7 +577,7 @@ 12.31 ["This initiative is already revoked"] = "Questa iniziativa e' gia' revocata"; 12.32 ["This initiative is revoked"] = "Questa iniziativa e' stata revocata"; 12.33 ["This invite key is connected with the following information:"] = "Questo codice invito e' associato alle seguenti informazioni:"; 12.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Questa tematica e' stata annullata. Non ha raggiunto il quorum di #{quorum}."; 12.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Questa tematica e' stata annullata. Non ha raggiunto il quorum di #{quorum}."; 12.36 ["This issue is already closed."] = "Questa tematica e' stata chiusa."; 12.37 ["This issue is already frozen."] = "Questa tematica e' stata sospesa."; 12.38 ["This login is already taken, please choose another one!"] = "Questo nome utente e' stato gia' scelto, prova a sceglierne un altro!";
13.1 --- a/locale/translations.nl.lua Sat Mar 09 19:19:44 2013 +0100 13.2 +++ b/locale/translations.nl.lua Sat Mar 09 19:31:33 2013 +0100 13.3 @@ -1,6 +1,6 @@ 13.4 #!/usr/bin/env lua 13.5 return { 13.6 -["#{count} cancelled"] = false; 13.7 +["#{count} canceled"] = false; 13.8 ["#{count} days ago"] = "#{count} dagen geleden"; 13.9 ["#{count} finished"] = "#{count} geëindigd"; 13.10 ["#{count} in discussion"] = "#{count} in discussie"; 13.11 @@ -101,12 +101,12 @@ 13.12 ["Cancel password reset"] = "Wachtwoord reset afbreken"; 13.13 ["Cancel refuse of invitation"] = "Uitnodiging weigeren afbreken"; 13.14 ["Cancel registration"] = "Registratie afbreken"; 13.15 -["Cancelled"] = "Afgebroken"; 13.16 -["Cancelled (before accepted due to revocation)"] = "Afgebroken (wegens terugtrekking)"; 13.17 -["Cancelled (during discussion due to revocation)"] = "Afgebroken (tijdens de discussie, wegens terugtrekking)"; 13.18 -["Cancelled (during verification due to revocation)"] = "Afgebroken (tijdens de verificatie, wegens terugtrekking)"; 13.19 -["Cancelled (issue not accepted)"] = "Afgebroken (onderwerp niet geaccepteerd)"; 13.20 -["Cancelled (no initiative admitted)"] = "Afgebroken (geen initiatiefvoorstel is toegelaten)"; 13.21 +["Canceled"] = "Afgebroken"; 13.22 +["Canceled (before accepted due to revocation)"] = "Afgebroken (wegens terugtrekking)"; 13.23 +["Canceled (during discussion due to revocation)"] = "Afgebroken (tijdens de discussie, wegens terugtrekking)"; 13.24 +["Canceled (during verification due to revocation)"] = "Afgebroken (tijdens de verificatie, wegens terugtrekking)"; 13.25 +["Canceled (issue not accepted)"] = "Afgebroken (onderwerp niet geaccepteerd)"; 13.26 +["Canceled (no initiative admitted)"] = "Afgebroken (geen initiatiefvoorstel is toegelaten)"; 13.27 ["Change area delegation"] = "Verander delegatie themagebied"; 13.28 ["Change email"] = "Verander het emailadres"; 13.29 ["Change email address"] = "Verander het emailadres"; 13.30 @@ -577,7 +577,7 @@ 13.31 ["This initiative is already revoked"] = "Dit initiatief is al teruggetrokken"; 13.32 ["This initiative is revoked"] = "Dit initiatief is teruggetrokken"; 13.33 ["This invite key is connected with the following information:"] = "Deze uitnodigingscode is gekoppeld aan de volgende informatie:"; 13.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Dit onderwerp is geannuleerd, het heeft het quorum #{quorum} niet gehaald."; 13.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Dit onderwerp is geannuleerd, het heeft het quorum #{quorum} niet gehaald."; 13.36 ["This issue is already closed."] = "Dit onderwerp is al afgesloten."; 13.37 ["This issue is already frozen."] = "Dit onderwerp is al bevroren"; 13.38 ["This login is already taken, please choose another one!"] = "Deze loginnaam is al bezet, kiest u alstublieft een andere!";
14.1 --- a/locale/translations.zh-Hans.lua Sat Mar 09 19:19:44 2013 +0100 14.2 +++ b/locale/translations.zh-Hans.lua Sat Mar 09 19:31:33 2013 +0100 14.3 @@ -1,6 +1,6 @@ 14.4 #!/usr/bin/env lua 14.5 return { 14.6 -["#{count} cancelled"] = "#{count} 个已取消"; 14.7 +["#{count} canceled"] = "#{count} 个已取消"; 14.8 ["#{count} days ago"] = "#{count} 日前"; 14.9 ["#{count} finished"] = "#{count} 个已结束"; 14.10 ["#{count} in discussion"] = "#{count} 个项目讨论中"; 14.11 @@ -101,12 +101,12 @@ 14.12 ["Cancel password reset"] = "取消密码重设"; 14.13 ["Cancel refuse of invitation"] = "取消婉拒邀请"; 14.14 ["Cancel registration"] = "取消注册"; 14.15 -["Cancelled"] = "已取消"; 14.16 -["Cancelled (before accepted due to revocation)"] = "已取消 (未被接受即撤销)"; 14.17 -["Cancelled (during discussion due to revocation)"] = "已取消 (在讨论期撤销)"; 14.18 -["Cancelled (during verification due to revocation)"] = "已取消 (在验证期撤销)"; 14.19 -["Cancelled (issue not accepted)"] = "已取消 (议题不被接受)"; 14.20 -["Cancelled (no initiative admitted)"] = "已取消 (无提案被递交)"; 14.21 +["Canceled"] = "已取消"; 14.22 +["Canceled (before accepted due to revocation)"] = "已取消 (未被接受即撤销)"; 14.23 +["Canceled (during discussion due to revocation)"] = "已取消 (在讨论期撤销)"; 14.24 +["Canceled (during verification due to revocation)"] = "已取消 (在验证期撤销)"; 14.25 +["Canceled (issue not accepted)"] = "已取消 (议题不被接受)"; 14.26 +["Canceled (no initiative admitted)"] = "已取消 (无提案被递交)"; 14.27 ["Change area delegation"] = "更改领域的委任"; 14.28 ["Change email"] = "更改电邮地址"; 14.29 ["Change email address"] = "更改电邮地址"; 14.30 @@ -577,7 +577,7 @@ 14.31 ["This initiative is already revoked"] = "此提案已撤销"; 14.32 ["This initiative is revoked"] = "此提案被撤销"; 14.33 ["This invite key is connected with the following information:"] = "此邀请码与下列资讯连结:"; 14.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "此议题因未达 #{quorum} 的法定门槛而被取消。"; 14.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = "此议题因未达 #{quorum} 的法定门槛而被取消。"; 14.36 ["This issue is already closed."] = "此议题已结案。"; 14.37 ["This issue is already frozen."] = "此议题已底定。"; 14.38 ["This login is already taken, please choose another one!"] = "此帐号已被使用,请另择一!";
15.1 --- a/locale/translations.zh-TW.lua Sat Mar 09 19:19:44 2013 +0100 15.2 +++ b/locale/translations.zh-TW.lua Sat Mar 09 19:31:33 2013 +0100 15.3 @@ -1,6 +1,6 @@ 15.4 #!/usr/bin/env lua 15.5 return { 15.6 -["#{count} cancelled"] = "#{count} 個已取消"; 15.7 +["#{count} canceled"] = "#{count} 個已取消"; 15.8 ["#{count} days ago"] = "#{count} 日前"; 15.9 ["#{count} finished"] = "#{count} 個已結束"; 15.10 ["#{count} in discussion"] = "#{count} 個項目討論中"; 15.11 @@ -101,12 +101,12 @@ 15.12 ["Cancel password reset"] = "取消密碼重設"; 15.13 ["Cancel refuse of invitation"] = "取消婉拒邀請"; 15.14 ["Cancel registration"] = "取消註冊"; 15.15 -["Cancelled"] = "已取消"; 15.16 -["Cancelled (before accepted due to revocation)"] = "已取消 (未被接受即撤銷)"; 15.17 -["Cancelled (during discussion due to revocation)"] = "已取消 (在討論期撤銷)"; 15.18 -["Cancelled (during verification due to revocation)"] = "已取消 (在驗證期撤銷)"; 15.19 -["Cancelled (issue not accepted)"] = "已取消 (議題不被接受)"; 15.20 -["Cancelled (no initiative admitted)"] = "已取消 (無提案被遞交)"; 15.21 +["Canceled"] = "已取消"; 15.22 +["Canceled (before accepted due to revocation)"] = "已取消 (未被接受即撤銷)"; 15.23 +["Canceled (during discussion due to revocation)"] = "已取消 (在討論期撤銷)"; 15.24 +["Canceled (during verification due to revocation)"] = "已取消 (在驗證期撤銷)"; 15.25 +["Canceled (issue not accepted)"] = "已取消 (議題不被接受)"; 15.26 +["Canceled (no initiative admitted)"] = "已取消 (無提案被遞交)"; 15.27 ["Change area delegation"] = "更改領域的委任"; 15.28 ["Change email"] = "更改電郵地址"; 15.29 ["Change email address"] = "更改電郵地址"; 15.30 @@ -577,7 +577,7 @@ 15.31 ["This initiative is already revoked"] = "此提案已撤銷"; 15.32 ["This initiative is revoked"] = "此提案被撤銷"; 15.33 ["This invite key is connected with the following information:"] = "此邀請碼與下列資訊連結:"; 15.34 -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "此議題因未達 #{quorum} 的法定門檻而被取消。"; 15.35 +["This issue has been canceled. It failed the quorum of #{quorum}."] = "此議題因未達 #{quorum} 的法定門檻而被取消。"; 15.36 ["This issue is already closed."] = "此議題已結案。"; 15.37 ["This issue is already frozen."] = "此議題已底定。"; 15.38 ["This login is already taken, please choose another one!"] = "此帳號已被使用,請另擇一!";
16.1 --- a/model/issue.lua Sat Mar 09 19:19:44 2013 +0100 16.2 +++ b/model/issue.lua Sat Mar 09 19:31:33 2013 +0100 16.3 @@ -193,12 +193,12 @@ 16.4 discussion = _"Discussion", 16.5 verification = _"Frozen", 16.6 voting = _"Voting", 16.7 - canceled_revoked_before_accepted = _"Cancelled (before accepted due to revocation)", 16.8 - canceled_issue_not_accepted = _"Cancelled (issue not accepted)", 16.9 - canceled_after_revocation_during_discussion = _"Cancelled (during discussion due to revocation)", 16.10 - canceled_after_revocation_during_verification = _"Cancelled (during verification due to revocation)", 16.11 + canceled_revoked_before_accepted = _"Canceled (before accepted due to revocation)", 16.12 + canceled_issue_not_accepted = _"Canceled (issue not accepted)", 16.13 + canceled_after_revocation_during_discussion = _"Canceled (during discussion due to revocation)", 16.14 + canceled_after_revocation_during_verification = _"Canceled (during verification due to revocation)", 16.15 calculation = _"Calculation", 16.16 - canceled_no_initiative_admitted = _"Cancelled (no initiative admitted)", 16.17 + canceled_no_initiative_admitted = _"Canceled (no initiative admitted)", 16.18 finished_without_winner = _"Finished (without winner)", 16.19 finished_with_winner = _"Finished (with winner)" 16.20 } 16.21 @@ -246,7 +246,7 @@ 16.22 initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL") 16.23 elseif state == "finished" then 16.24 initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.closed NOTNULL") 16.25 - elseif state == "cancelled" then 16.26 + elseif state == "canceled" then 16.27 initiatives_selector:add_where("issue.fully_frozen ISNULL AND issue.closed NOTNULL") 16.28 else 16.29 error("Invalid state")