liquid_feedback_frontend

changeset 1081:86073b9999dc v3.0.2

Improved phase inline help texts and translations
author bsw
date Wed Jul 23 21:19:19 2014 +0200 (2014-07-23)
parents cb9e75ac968f
children 8fc0efee260f 6639b4188d7d
files app/main/issue/_sidebar_state.lua locale/translations.de.lua
line diff
     1.1 --- a/app/main/issue/_sidebar_state.lua	Wed Jul 23 20:47:57 2014 +0200
     1.2 +++ b/app/main/issue/_sidebar_state.lua	Wed Jul 23 21:19:19 2014 +0200
     1.3 @@ -147,10 +147,10 @@
     1.4          end }
     1.5  
     1.6          local help_texts = {
     1.7 -          admission = _("As soon as one initiative of this issue reaches #{quorum} support, the issue will go into discussion phase.", { quorum = quorum_text(issue.policy, 1) }),
     1.8 -          discussion = _"During the discussion phase the issue is debated between initiators while the initiatives are improved by suggestions from the supporters.",
     1.9 -          verification = _("During the verification phase the initiative drafts cannot be changed anymore. Initiatives needs to reach a quorum of #{quorum} to become admitted for voting.", { quorum = quorum_text(issue.policy, 2) }),
    1.10 -          voting = _"On this issue can be voted now."
    1.11 +          admission = _("As soon as one initiative of this issue reaches the 1st quorum of #{quorum} support, the issue will proceed to discussion phase.", { quorum = quorum_text(issue.policy, 1) }),
    1.12 +          discussion = _"During the discussion phase, the issue is debated on while the initiators improve the proposals and reasons in their initiatives. Supporters of initiatives can write and rate suggestions for improvement.",
    1.13 +          verification = _("During the verification phase, existing initiatives cannot be changed anymore. Initiatives need to pass the 2nd quorum of #{quorum} at end of verification phase to become admitted for voting.", { quorum = quorum_text(issue.policy, 2) }),
    1.14 +          voting = _"During the voting phase, votes for all admitted initiatives in this issue can be cast. The final result will be calculated as soon as this phase ends."
    1.15          }
    1.16          ui.container { attr = { id = "phase-help-" .. state, style = "display: none;" }, content = help_texts[state] }
    1.17  
     2.1 --- a/locale/translations.de.lua	Wed Jul 23 20:47:57 2014 +0200
     2.2 +++ b/locale/translations.de.lua	Wed Jul 23 21:19:19 2014 +0200
     2.3 @@ -100,7 +100,7 @@
     2.4  ["Area delegation"] = "Delegation für Themenbereich";
     2.5  ["Area list of '#{unit_name}'"] = "Themenbereiche in '#{unit_name}'";
     2.6  ["As long as you are interested in this issue yourself, the delegation is suspended for this issue, but it will be applied again in the voting phase unless you vote yourself."] = "Solange du selber am Thema interessiert bist, wird die Delegation für dieses Thema ausgesetzt, jedoch während der Abstimmung erneut aktiv, es sei denn du stimmst selber ab.";
     2.7 -["As soon as one initiative of this issue reaches #{quorum} support, the issue will go into discussion phase."] = "Sobald eine Initiative des Themas das 1. Quorum von #{quorum} Unterstützern erreicht, geht das Thema in die Diskussionsphase über.";
     2.8 +["As soon as one initiative of this issue reaches the 1st quorum of #{quorum} support, the issue will proceed to discussion phase."] = "Sobald eine Initiative des Themas das 1. Quorum von #{quorum} Unterstützern erreicht, geht das Thema in die Diskussionsphase über.";
     2.9  ["Author"] = "Autor";
    2.10  ["Available policies"] = "Verfügbare Regelwerke";
    2.11  ["Avatar"] = "Avatar";
    2.12 @@ -202,8 +202,9 @@
    2.13  ["Download documents"] = "Dokumente herunterladen";
    2.14  ["Draft history"] = "Entwurfshistorie";
    2.15  ["Draft revision #{id}"] = "Entwurf Revision #{id}";
    2.16 -["During the discussion phase the issue is debated between initiators while the initiatives are improved by suggestions from the supporters."] = "Während der Diskussionsphase wird das Thema zwischen den Initiatoren debattiert, während die Entwurfstext der Initiativen durch Verbesserungsvorschläge der Unterstützer weiterentwickelt wird.";
    2.17 -["During the verification phase the initiative drafts cannot be changed anymore."] = "Während der Überprüfungsphase kann der Text der Initiative nicht mehr geändert werden.";
    2.18 +["During the discussion phase, the issue is debated on while the initiators improve the proposals and reasons in their initiatives. Supporters of initiatives can write and rate suggestions for improvement."] = "Während der Diskussionsphase wird das Thema debattiert während die Initiatoren die Anträge und Begründungen in ihren Initiativen verbessern. Unterstützer der Initiativen können Verbesserungsvorschläge machen und bewerten.";
    2.19 +["During the verification phase, existing initiatives cannot be changed anymore. Initiatives need to pass the 2nd quorum of #{quorum} at end of verification phase to become admitted for voting."] = "Während der Überprüfungsphase kann der Text existierender Initiativen nicht mehr geändert werden. Initiativen müssen am Ende der Überprüfungsphase das 2. Quorum von #{quorum} erreichen, um für die Abstimmung zugelassen zu werden.";
    2.20 +["During the voting phase, votes for all admitted initiatives in this issue can be cast. The final result will be calculated as soon as this phase ends."] = "Während der Abstimmungsphase können Stimmen für alle zugelassenen Initiativen abgegeben werden. Das Endergebnis wird nach Abschluss der Phase berechnet.";
    2.21  ["Edit"] = "Bearbeiten";
    2.22  ["Edit again"] = "Nochmal bearbeiten";
    2.23  ["Edit areas"] = "Themenbereiche bearbeiten";

Impressum / About Us