# HG changeset patch # User bsw # Date 1362853893 -3600 # Node ID 8d5b214889c3ed487260ea25b8188419688e4b6f # Parent 9fbbd04ea8891a10b720e751d362d85b0c01837b Globally changed "cancelled"(BE) to "canceled"(AE) diff -r 9fbbd04ea889 -r 8d5b214889c3 app/main/area/_list.lua --- a/app/main/area/_list.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/app/main/area/_list.lua Sat Mar 09 19:31:33 2013 +0100 @@ -14,7 +14,7 @@ :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") :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL)", "issues_voting_count") :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed NOTNULL)", "issues_finished_count") - :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_cancelled_count") + :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_canceled_count") if app.session.member_id then areas_selector diff -r 9fbbd04ea889 -r 8d5b214889c3 app/main/area/_list_entry.lua --- a/app/main/area/_list_entry.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/app/main/area/_list_entry.lua Sat Mar 09 19:31:33 2013 +0100 @@ -34,8 +34,8 @@ } slot.put(" · ") ui.link{ - module = "area", view = "show", id = area.id, params = { tab = "closed", filter = "cancelled" }, - text = _("#{count} cancelled", { count = area.issues_cancelled_count }) + module = "area", view = "show", id = area.id, params = { tab = "closed", filter = "canceled" }, + text = _("#{count} canceled", { count = area.issues_canceled_count }) } end } diff -r 9fbbd04ea889 -r 8d5b214889c3 app/main/index/_member_home.lua --- a/app/main/index/_member_home.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/app/main/index/_member_home.lua Sat Mar 09 19:31:33 2013 +0100 @@ -61,7 +61,7 @@ :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") :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed ISNULL)", "issues_voting_count") :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen NOTNULL AND issue.closed NOTNULL)", "issues_finished_count") - :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_cancelled_count") + :add_field("(SELECT COUNT(*) FROM issue WHERE issue.area_id = area.id AND issue.fully_frozen ISNULL AND issue.closed NOTNULL)", "issues_canceled_count") :add_where{ "area.unit_id = ?", unit.id } :add_where{ "area.active" } :add_order_by("area.name") diff -r 9fbbd04ea889 -r 8d5b214889c3 app/main/issue/_filters.lua --- a/app/main/issue/_filters.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/app/main/issue/_filters.lua Sat Mar 09 19:31:33 2013 +0100 @@ -93,8 +93,8 @@ end } filter[#filter+1] = { - name = "cancelled", - label = _"Cancelled", + name = "canceled", + label = _"Canceled", selector_modifier = function(selector) if for_events then @@ -147,8 +147,8 @@ end } filter[#filter+1] = { - name = "cancelled", - label = _"Cancelled", + name = "canceled", + label = _"Canceled", selector_modifier = function(selector) if for_events then selector:add_where("event.state NOT IN ('finished_with_winner', 'finished_without_winner')") diff -r 9fbbd04ea889 -r 8d5b214889c3 app/main/issue/_show.lua --- a/app/main/issue/_show.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/app/main/issue/_show.lua Sat Mar 09 19:31:33 2013 +0100 @@ -254,12 +254,12 @@ local policy = issue.policy ui.container{ attr = { class = "not_admitted_info" }, - content = _("This issue has been cancelled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) }) + content = _("This issue has been canceled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) }) } elseif issue.state:sub(1, #("canceled_")) == "canceled_" then ui.container{ attr = { class = "not_admitted_info" }, - content = _("This issue has been cancelled.") + content = _("This issue has been canceled.") } end end diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.de.lua --- a/locale/translations.de.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.de.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = "#{count} abgebrochen"; +["#{count} canceled"] = "#{count} abgebrochen"; ["#{count} days ago"] = "vor #{count} Tagen"; ["#{count} finished"] = "#{count} abgeschlossen"; ["#{count} in discussion"] = "#{count} in Diskussion"; @@ -101,12 +101,12 @@ ["Cancel password reset"] = "Kennwort-Rücksetzung abbrechen"; ["Cancel refuse of invitation"] = "Ablehnung der Einladung aufheben"; ["Cancel registration"] = "Registrierung abbrechen"; -["Cancelled"] = "Abgebrochen"; -["Cancelled (before accepted due to revocation)"] = "Abgebrochen (in Neu-Phase, wegen Rückzug)"; -["Cancelled (during discussion due to revocation)"] = "Abgebrochen (während Diskussion, wegen Rückzug)"; -["Cancelled (during verification due to revocation)"] = "Abgebrochen (während Eingefroren-Phase, wegen Rückzug)"; -["Cancelled (issue not accepted)"] = "Abgebrochen (Thema nicht akzeptiert)"; -["Cancelled (no initiative admitted)"] = "Abgebrochen (Keine Initiative zugelassen)"; +["Canceled"] = "Abgebrochen"; +["Canceled (before accepted due to revocation)"] = "Abgebrochen (in Neu-Phase, wegen Rückzug)"; +["Canceled (during discussion due to revocation)"] = "Abgebrochen (während Diskussion, wegen Rückzug)"; +["Canceled (during verification due to revocation)"] = "Abgebrochen (während Eingefroren-Phase, wegen Rückzug)"; +["Canceled (issue not accepted)"] = "Abgebrochen (Thema nicht akzeptiert)"; +["Canceled (no initiative admitted)"] = "Abgebrochen (Keine Initiative zugelassen)"; ["Change area delegation"] = "Delegation für Themenbereich ändern"; ["Change email"] = "E-Mail-Adresse ändern"; ["Change email address"] = "E-Mail-Adresse ändern"; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = "Diese Initiative ist schon zurückgezogen"; ["This initiative is revoked"] = "Diese Initiative wurde zurückgezogen"; ["This invite key is connected with the following information:"] = "Dieser Einladungscode ist mit den folgenden Daten verknüpft:"; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Dieses Thema wurde abgebrochen. Es hat das Quorum von #{quorum} nicht erfüllt."; +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Dieses Thema wurde abgebrochen. Es hat das Quorum von #{quorum} nicht erfüllt."; ["This issue is already closed."] = "Das Thema ist schon geschlossen."; ["This issue is already frozen."] = "Das Thema ist schon eingefroren"; ["This login is already taken, please choose another one!"] = "Dieser Anmeldename ist bereits vergeben, bitte wähle einen anderen!"; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.el.lua --- a/locale/translations.el.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.el.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = "#{count} ακυρώθηκαν"; +["#{count} canceled"] = "#{count} ακυρώθηκαν"; ["#{count} days ago"] = "#{count} μέρες πριν"; ["#{count} finished"] = "#{count} ολοκληρώθηκαν"; ["#{count} in discussion"] = "#{count} σε διαβούλευση"; @@ -101,12 +101,12 @@ ["Cancel password reset"] = "Ακύρωση επαναφοράς κωδικού πρόσβασης"; ["Cancel refuse of invitation"] = "Ακύρωση απόρριψης της πρόσκλησης"; ["Cancel registration"] = "Ακύρωση εγγραφής"; -["Cancelled"] = "Ακυρώθηκε"; -["Cancelled (before accepted due to revocation)"] = "Ακυρώθηκε (στη φάση 'Νέο', λόγω ανάκλησης)"; -["Cancelled (during discussion due to revocation)"] = "Ακυρώθηκε (κατά τη διάρκεια της συζήτησης, λόγω ανάκλησης)"; -["Cancelled (during verification due to revocation)"] = "Ακυρώθηκε (κατά τη διάρκεια της επιβεβαίωσης, λόγω ανάκλησης)"; -["Cancelled (issue not accepted)"] = "Ακυρώθηκε (Δεν έγινε δεκτό)"; -["Cancelled (no initiative admitted)"] = "Ακυρώθηκε (Δεν προκρίθηκε καμία πρωτοβουλία)"; +["Canceled"] = "Ακυρώθηκε"; +["Canceled (before accepted due to revocation)"] = "Ακυρώθηκε (στη φάση 'Νέο', λόγω ανάκλησης)"; +["Canceled (during discussion due to revocation)"] = "Ακυρώθηκε (κατά τη διάρκεια της συζήτησης, λόγω ανάκλησης)"; +["Canceled (during verification due to revocation)"] = "Ακυρώθηκε (κατά τη διάρκεια της επιβεβαίωσης, λόγω ανάκλησης)"; +["Canceled (issue not accepted)"] = "Ακυρώθηκε (Δεν έγινε δεκτό)"; +["Canceled (no initiative admitted)"] = "Ακυρώθηκε (Δεν προκρίθηκε καμία πρωτοβουλία)"; ["Change area delegation"] = "Αλλαγή ανάθεσης για τον τομέα"; ["Change email"] = "Αλλαγή email"; ["Change email address"] = "Αλλαγή διεύθυνσης email"; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = "Αυτή η πρωτοβουλία έχει ήδη ανακληθεί"; ["This initiative is revoked"] = "Αυτή η πρωτοβουλία έχει ανακληθεί"; ["This invite key is connected with the following information:"] = "Αυτός ο κωδικός πρόσκλησης σχετίζεται με τα ακόλουθα στοιχεία:"; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Αυτό το θέμα έχει ακυρωθεί. Δεν είχε την απαιτούμενη απαρτία #{quorum}"; +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Αυτό το θέμα έχει ακυρωθεί. Δεν είχε την απαιτούμενη απαρτία #{quorum}"; ["This issue is already closed."] = "Αυτό το θέμα έχει ήδη κλείσει."; ["This issue is already frozen."] = "Αυτό το θέμα έχει ήδη παγώσει."; ["This login is already taken, please choose another one!"] = "Αυτό το όνομα σύνδεσης υπάρχει ήδη, παρακαλώ επιλέξτε κάποιο άλλο!"; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.en.lua --- a/locale/translations.en.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.en.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = false; +["#{count} canceled"] = false; ["#{count} days ago"] = false; ["#{count} finished"] = false; ["#{count} in discussion"] = false; @@ -101,12 +101,12 @@ ["Cancel password reset"] = false; ["Cancel refuse of invitation"] = false; ["Cancel registration"] = false; -["Cancelled"] = false; -["Cancelled (before accepted due to revocation)"] = false; -["Cancelled (during discussion due to revocation)"] = false; -["Cancelled (during verification due to revocation)"] = false; -["Cancelled (issue not accepted)"] = false; -["Cancelled (no initiative admitted)"] = false; +["Canceled"] = false; +["Canceled (before accepted due to revocation)"] = false; +["Canceled (during discussion due to revocation)"] = false; +["Canceled (during verification due to revocation)"] = false; +["Canceled (issue not accepted)"] = false; +["Canceled (no initiative admitted)"] = false; ["Change area delegation"] = false; ["Change email"] = false; ["Change email address"] = false; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = false; ["This initiative is revoked"] = false; ["This invite key is connected with the following information:"] = false; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = false; +["This issue has been canceled. It failed the quorum of #{quorum}."] = false; ["This issue is already closed."] = false; ["This issue is already frozen."] = false; ["This login is already taken, please choose another one!"] = false; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.eo.lua --- a/locale/translations.eo.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.eo.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = false; +["#{count} canceled"] = false; ["#{count} days ago"] = false; ["#{count} finished"] = false; ["#{count} in discussion"] = false; @@ -101,12 +101,12 @@ ["Cancel password reset"] = "Nuligi pasvortoremeton"; ["Cancel refuse of invitation"] = "Nuligi rifuzon de la invito"; ["Cancel registration"] = "Nuligi registradon"; -["Cancelled"] = "Abolita"; -["Cancelled (before accepted due to revocation)"] = false; -["Cancelled (during discussion due to revocation)"] = false; -["Cancelled (during verification due to revocation)"] = false; -["Cancelled (issue not accepted)"] = false; -["Cancelled (no initiative admitted)"] = false; +["Canceled"] = "Abolita"; +["Canceled (before accepted due to revocation)"] = false; +["Canceled (during discussion due to revocation)"] = false; +["Canceled (during verification due to revocation)"] = false; +["Canceled (issue not accepted)"] = false; +["Canceled (no initiative admitted)"] = false; ["Change area delegation"] = "Ŝanĝi delegacion por temaro"; ["Change email"] = "Ŝanĝi retpoŝton"; ["Change email address"] = "Ŝanĝi retpoŝtadreson"; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = "Tiu iniciato estas jam nuligita"; ["This initiative is revoked"] = "Tiu iniciato estas nuligita"; ["This invite key is connected with the following information:"] = false; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Tiu temo estas abolita. Ĝi malsukcesis la kvorumon de #{quorum}."; +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Tiu temo estas abolita. Ĝi malsukcesis la kvorumon de #{quorum}."; ["This issue is already closed."] = "La temo estas jam fermita."; ["This issue is already frozen."] = "La temo estas jam ĝelita"; ["This login is already taken, please choose another one!"] = "Tiu salutnomo estas jam prenita, bonvolu elekti alian!"; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.fr.lua --- a/locale/translations.fr.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.fr.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = false; +["#{count} canceled"] = false; ["#{count} days ago"] = false; ["#{count} finished"] = false; ["#{count} in discussion"] = false; @@ -101,12 +101,12 @@ ["Cancel password reset"] = false; ["Cancel refuse of invitation"] = false; ["Cancel registration"] = false; -["Cancelled"] = false; -["Cancelled (before accepted due to revocation)"] = false; -["Cancelled (during discussion due to revocation)"] = false; -["Cancelled (during verification due to revocation)"] = false; -["Cancelled (issue not accepted)"] = false; -["Cancelled (no initiative admitted)"] = false; +["Canceled"] = false; +["Canceled (before accepted due to revocation)"] = false; +["Canceled (during discussion due to revocation)"] = false; +["Canceled (during verification due to revocation)"] = false; +["Canceled (issue not accepted)"] = false; +["Canceled (no initiative admitted)"] = false; ["Change area delegation"] = false; ["Change email"] = false; ["Change email address"] = false; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = false; ["This initiative is revoked"] = false; ["This invite key is connected with the following information:"] = false; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = false; +["This issue has been canceled. It failed the quorum of #{quorum}."] = false; ["This issue is already closed."] = false; ["This issue is already frozen."] = false; ["This login is already taken, please choose another one!"] = false; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.hu.lua --- a/locale/translations.hu.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.hu.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = false; +["#{count} canceled"] = false; ["#{count} days ago"] = "#{count} nappal ezelõtt"; ["#{count} finished"] = false; ["#{count} in discussion"] = false; @@ -101,12 +101,12 @@ ["Cancel password reset"] = "Jelszóvisszaállítás megszakítása"; ["Cancel refuse of invitation"] = "Meghívás elutasításának megszakítása"; ["Cancel registration"] = "Regisztrálás megszakítása"; -["Cancelled"] = "Megszakítva"; -["Cancelled (before accepted due to revocation)"] = "Megszakítva (elfogadás elõtt, visszavonás miatt)"; -["Cancelled (during discussion due to revocation)"] = "Megszakítva (tárgyalás közben, visszavonás miatt)"; -["Cancelled (during verification due to revocation)"] = "Megszakítva (ellenõrzés közben, visszavonás miatt)"; -["Cancelled (issue not accepted)"] = "Megszakítva (el nem fogadott téma)"; -["Cancelled (no initiative admitted)"] = "Megszakítva (nem engedélyezett kezdeményezés)"; +["Canceled"] = "Megszakítva"; +["Canceled (before accepted due to revocation)"] = "Megszakítva (elfogadás elõtt, visszavonás miatt)"; +["Canceled (during discussion due to revocation)"] = "Megszakítva (tárgyalás közben, visszavonás miatt)"; +["Canceled (during verification due to revocation)"] = "Megszakítva (ellenõrzés közben, visszavonás miatt)"; +["Canceled (issue not accepted)"] = "Megszakítva (el nem fogadott téma)"; +["Canceled (no initiative admitted)"] = "Megszakítva (nem engedélyezett kezdeményezés)"; ["Change area delegation"] = "Témakör-delegáció módosítása"; ["Change email"] = "Email-cím módosítása"; ["Change email address"] = "Email-cím módosítása"; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = "Ezt a kezdeményezést már visszavonták"; ["This initiative is revoked"] = "Ezt a kezdeményezést visszavonták"; ["This invite key is connected with the following information:"] = "Ehhez a meghívókulcshoz a következõ adatok kapcsolódnak:"; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Téma megszakítva. Nincs meg a határozatképesség: #(quorum)."; +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Téma megszakítva. Nincs meg a határozatképesség: #(quorum)."; ["This issue is already closed."] = "Téma már lezárva."; ["This issue is already frozen."] = "Téma már befagyasztva."; ["This login is already taken, please choose another one!"] = "Ez a bejelentkezési név más foglalt, válassz másikat!"; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.it.lua --- a/locale/translations.it.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.it.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = "#{count} annullati"; +["#{count} canceled"] = "#{count} annullati"; ["#{count} days ago"] = "#{count} giorni fa"; ["#{count} finished"] = "#{count} terminati"; ["#{count} in discussion"] = "#{count} discussione in corso"; @@ -101,12 +101,12 @@ ["Cancel password reset"] = "Annulla il ripristino della password"; ["Cancel refuse of invitation"] = "Annulla il rifiuto all'invito"; ["Cancel registration"] = "Annulla la registrazione"; -["Cancelled"] = "Annullato"; -["Cancelled (before accepted due to revocation)"] = "Annullato (revocato prima dell'approvazione)"; -["Cancelled (during discussion due to revocation)"] = "Annullato (revocato durante la discussione)"; -["Cancelled (during verification due to revocation)"] = "Annullato (revocato durante la verifica)"; -["Cancelled (issue not accepted)"] = "Annullato (tematica non approvata)"; -["Cancelled (no initiative admitted)"] = "Annullato (nessuna iniziativa ammessa)"; +["Canceled"] = "Annullato"; +["Canceled (before accepted due to revocation)"] = "Annullato (revocato prima dell'approvazione)"; +["Canceled (during discussion due to revocation)"] = "Annullato (revocato durante la discussione)"; +["Canceled (during verification due to revocation)"] = "Annullato (revocato durante la verifica)"; +["Canceled (issue not accepted)"] = "Annullato (tematica non approvata)"; +["Canceled (no initiative admitted)"] = "Annullato (nessuna iniziativa ammessa)"; ["Change area delegation"] = "Cambia la delega per l'area"; ["Change email"] = "Cambia email"; ["Change email address"] = "Cambia email"; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = "Questa iniziativa e' gia' revocata"; ["This initiative is revoked"] = "Questa iniziativa e' stata revocata"; ["This invite key is connected with the following information:"] = "Questo codice invito e' associato alle seguenti informazioni:"; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Questa tematica e' stata annullata. Non ha raggiunto il quorum di #{quorum}."; +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Questa tematica e' stata annullata. Non ha raggiunto il quorum di #{quorum}."; ["This issue is already closed."] = "Questa tematica e' stata chiusa."; ["This issue is already frozen."] = "Questa tematica e' stata sospesa."; ["This login is already taken, please choose another one!"] = "Questo nome utente e' stato gia' scelto, prova a sceglierne un altro!"; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.nl.lua --- a/locale/translations.nl.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.nl.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = false; +["#{count} canceled"] = false; ["#{count} days ago"] = "#{count} dagen geleden"; ["#{count} finished"] = "#{count} geëindigd"; ["#{count} in discussion"] = "#{count} in discussie"; @@ -101,12 +101,12 @@ ["Cancel password reset"] = "Wachtwoord reset afbreken"; ["Cancel refuse of invitation"] = "Uitnodiging weigeren afbreken"; ["Cancel registration"] = "Registratie afbreken"; -["Cancelled"] = "Afgebroken"; -["Cancelled (before accepted due to revocation)"] = "Afgebroken (wegens terugtrekking)"; -["Cancelled (during discussion due to revocation)"] = "Afgebroken (tijdens de discussie, wegens terugtrekking)"; -["Cancelled (during verification due to revocation)"] = "Afgebroken (tijdens de verificatie, wegens terugtrekking)"; -["Cancelled (issue not accepted)"] = "Afgebroken (onderwerp niet geaccepteerd)"; -["Cancelled (no initiative admitted)"] = "Afgebroken (geen initiatiefvoorstel is toegelaten)"; +["Canceled"] = "Afgebroken"; +["Canceled (before accepted due to revocation)"] = "Afgebroken (wegens terugtrekking)"; +["Canceled (during discussion due to revocation)"] = "Afgebroken (tijdens de discussie, wegens terugtrekking)"; +["Canceled (during verification due to revocation)"] = "Afgebroken (tijdens de verificatie, wegens terugtrekking)"; +["Canceled (issue not accepted)"] = "Afgebroken (onderwerp niet geaccepteerd)"; +["Canceled (no initiative admitted)"] = "Afgebroken (geen initiatiefvoorstel is toegelaten)"; ["Change area delegation"] = "Verander delegatie themagebied"; ["Change email"] = "Verander het emailadres"; ["Change email address"] = "Verander het emailadres"; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = "Dit initiatief is al teruggetrokken"; ["This initiative is revoked"] = "Dit initiatief is teruggetrokken"; ["This invite key is connected with the following information:"] = "Deze uitnodigingscode is gekoppeld aan de volgende informatie:"; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "Dit onderwerp is geannuleerd, het heeft het quorum #{quorum} niet gehaald."; +["This issue has been canceled. It failed the quorum of #{quorum}."] = "Dit onderwerp is geannuleerd, het heeft het quorum #{quorum} niet gehaald."; ["This issue is already closed."] = "Dit onderwerp is al afgesloten."; ["This issue is already frozen."] = "Dit onderwerp is al bevroren"; ["This login is already taken, please choose another one!"] = "Deze loginnaam is al bezet, kiest u alstublieft een andere!"; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.zh-Hans.lua --- a/locale/translations.zh-Hans.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.zh-Hans.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = "#{count} 个已取消"; +["#{count} canceled"] = "#{count} 个已取消"; ["#{count} days ago"] = "#{count} 日前"; ["#{count} finished"] = "#{count} 个已结束"; ["#{count} in discussion"] = "#{count} 个项目讨论中"; @@ -101,12 +101,12 @@ ["Cancel password reset"] = "取消密码重设"; ["Cancel refuse of invitation"] = "取消婉拒邀请"; ["Cancel registration"] = "取消注册"; -["Cancelled"] = "已取消"; -["Cancelled (before accepted due to revocation)"] = "已取消 (未被接受即撤销)"; -["Cancelled (during discussion due to revocation)"] = "已取消 (在讨论期撤销)"; -["Cancelled (during verification due to revocation)"] = "已取消 (在验证期撤销)"; -["Cancelled (issue not accepted)"] = "已取消 (议题不被接受)"; -["Cancelled (no initiative admitted)"] = "已取消 (无提案被递交)"; +["Canceled"] = "已取消"; +["Canceled (before accepted due to revocation)"] = "已取消 (未被接受即撤销)"; +["Canceled (during discussion due to revocation)"] = "已取消 (在讨论期撤销)"; +["Canceled (during verification due to revocation)"] = "已取消 (在验证期撤销)"; +["Canceled (issue not accepted)"] = "已取消 (议题不被接受)"; +["Canceled (no initiative admitted)"] = "已取消 (无提案被递交)"; ["Change area delegation"] = "更改领域的委任"; ["Change email"] = "更改电邮地址"; ["Change email address"] = "更改电邮地址"; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = "此提案已撤销"; ["This initiative is revoked"] = "此提案被撤销"; ["This invite key is connected with the following information:"] = "此邀请码与下列资讯连结："; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "此议题因未达 #{quorum} 的法定门槛而被取消。"; +["This issue has been canceled. It failed the quorum of #{quorum}."] = "此议题因未达 #{quorum} 的法定门槛而被取消。"; ["This issue is already closed."] = "此议题已结案。"; ["This issue is already frozen."] = "此议题已底定。"; ["This login is already taken, please choose another one!"] = "此帐号已被使用，请另择一！"; diff -r 9fbbd04ea889 -r 8d5b214889c3 locale/translations.zh-TW.lua --- a/locale/translations.zh-TW.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/locale/translations.zh-TW.lua Sat Mar 09 19:31:33 2013 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env lua return { -["#{count} cancelled"] = "#{count} 個已取消"; +["#{count} canceled"] = "#{count} 個已取消"; ["#{count} days ago"] = "#{count} 日前"; ["#{count} finished"] = "#{count} 個已結束"; ["#{count} in discussion"] = "#{count} 個項目討論中"; @@ -101,12 +101,12 @@ ["Cancel password reset"] = "取消密碼重設"; ["Cancel refuse of invitation"] = "取消婉拒邀請"; ["Cancel registration"] = "取消註冊"; -["Cancelled"] = "已取消"; -["Cancelled (before accepted due to revocation)"] = "已取消 (未被接受即撤銷)"; -["Cancelled (during discussion due to revocation)"] = "已取消 (在討論期撤銷)"; -["Cancelled (during verification due to revocation)"] = "已取消 (在驗證期撤銷)"; -["Cancelled (issue not accepted)"] = "已取消 (議題不被接受)"; -["Cancelled (no initiative admitted)"] = "已取消 (無提案被遞交)"; +["Canceled"] = "已取消"; +["Canceled (before accepted due to revocation)"] = "已取消 (未被接受即撤銷)"; +["Canceled (during discussion due to revocation)"] = "已取消 (在討論期撤銷)"; +["Canceled (during verification due to revocation)"] = "已取消 (在驗證期撤銷)"; +["Canceled (issue not accepted)"] = "已取消 (議題不被接受)"; +["Canceled (no initiative admitted)"] = "已取消 (無提案被遞交)"; ["Change area delegation"] = "更改領域的委任"; ["Change email"] = "更改電郵地址"; ["Change email address"] = "更改電郵地址"; @@ -577,7 +577,7 @@ ["This initiative is already revoked"] = "此提案已撤銷"; ["This initiative is revoked"] = "此提案被撤銷"; ["This invite key is connected with the following information:"] = "此邀請碼與下列資訊連結："; -["This issue has been cancelled. It failed the quorum of #{quorum}."] = "此議題因未達 #{quorum} 的法定門檻而被取消。"; +["This issue has been canceled. It failed the quorum of #{quorum}."] = "此議題因未達 #{quorum} 的法定門檻而被取消。"; ["This issue is already closed."] = "此議題已結案。"; ["This issue is already frozen."] = "此議題已底定。"; ["This login is already taken, please choose another one!"] = "此帳號已被使用，請另擇一！"; diff -r 9fbbd04ea889 -r 8d5b214889c3 model/issue.lua --- a/model/issue.lua Sat Mar 09 19:19:44 2013 +0100 +++ b/model/issue.lua Sat Mar 09 19:31:33 2013 +0100 @@ -193,12 +193,12 @@ discussion = _"Discussion", verification = _"Frozen", voting = _"Voting", - canceled_revoked_before_accepted = _"Cancelled (before accepted due to revocation)", - canceled_issue_not_accepted = _"Cancelled (issue not accepted)", - canceled_after_revocation_during_discussion = _"Cancelled (during discussion due to revocation)", - canceled_after_revocation_during_verification = _"Cancelled (during verification due to revocation)", + canceled_revoked_before_accepted = _"Canceled (before accepted due to revocation)", + canceled_issue_not_accepted = _"Canceled (issue not accepted)", + canceled_after_revocation_during_discussion = _"Canceled (during discussion due to revocation)", + canceled_after_revocation_during_verification = _"Canceled (during verification due to revocation)", calculation = _"Calculation", - canceled_no_initiative_admitted = _"Cancelled (no initiative admitted)", + canceled_no_initiative_admitted = _"Canceled (no initiative admitted)", finished_without_winner = _"Finished (without winner)", finished_with_winner = _"Finished (with winner)" } @@ -246,7 +246,7 @@ initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL") elseif state == "finished" then initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.closed NOTNULL") - elseif state == "cancelled" then + elseif state == "canceled" then initiatives_selector:add_where("issue.fully_frozen ISNULL AND issue.closed NOTNULL") else error("Invalid state")