From 40a26852cd0475b68623487ad9d099a6ce9a767d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rgvin=20Ragnarsson?= Date: Mon, 28 Dec 2015 02:34:56 +0200 Subject: [PATCH 001/993] Don't rely on shebang as it does not work for files with Windows line endings Makes sense when using Git & Docker for Windows --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f692cf14..0a26c7c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,4 @@ # docker run -it -p 8000:8000 wasa2il FROM python:2-onbuild -RUN apt-get update && apt-get install tofrodos -RUN fromdos initial_setup.py -RUN fromdos wasa2il/manage.py - -CMD ./initial_setup.py && cd wasa2il && ./manage.py runserver $(hostname -i):8000 +CMD python initial_setup.py && cd wasa2il && python manage.py runserver $(hostname -i):8000 From 0942866b471ba8b95bd9fd16e6c72e4722941289 Mon Sep 17 00:00:00 2001 From: Herbert Snorrason Date: Wed, 30 Dec 2015 17:50:39 +0000 Subject: [PATCH 002/993] Add a facility to provide user information to Discourse. This enables PP-IS to use the same login information for both wasa2il and its Discourse forum. The long-term desirability of this feature is questionable. --- wasa2il/core/views.py | 49 +++++++++++++++++++++++++++++++ wasa2il/local_settings.py-example | 6 ++++ wasa2il/urls.py | 1 + 3 files changed, 56 insertions(+) diff --git a/wasa2il/core/views.py b/wasa2il/core/views.py index dce05bc2..0f22848f 100644 --- a/wasa2il/core/views.py +++ b/wasa2il/core/views.py @@ -4,8 +4,17 @@ import decimal import json +# for Discourse SSO support +import base64 +import hmac +import hashlib +import urllib +from urlparse import parse_qs +# SSO done + from django.shortcuts import render_to_response, redirect, get_object_or_404 from django.http import HttpResponseRedirect +from django.http import HttpResponseBadRequest from django.http import Http404 from django.views.generic import ListView, CreateView, UpdateView, DetailView from django.template import RequestContext @@ -233,6 +242,46 @@ def verify(request): return HttpResponseRedirect('/') +@login_required +def sso(request): + if not hasattr(settings, 'DISCOURSE'): + raise Http404 + + key = str(settings.DISCOURSE['secret']) + return_url = '%s/session/sso_login' % settings.DISCOURSE['url'] + + payload = request.GET.get('sso') + their_signature = request.GET.get('sig') + + if None in [payload, their_signature]: + return HttpResponseBadRequest('Required parameters missing.') + + try: + payload = urllib.unquote(payload) + decoded = base64.decodestring(payload) + assert 'nonce' in decoded + assert len(payload) > 0 + except: + return HttpResponseBadRequest('Malformed payload.') + + our_signature = hmac.new(key, payload, digestmod=hashlib.sha256).hexdigest() + + if our_signature != their_signature: + return HttpResponseBadRequest('Malformed payload.') + + nonce = parse_qs(decoded)['nonce'][0] + outbound = { + 'nonce': nonce, + 'email': request.user.email, + 'external_id': request.user.id, + 'username': request.user.username, + } + + out_payload = base64.encodestring(urllib.urlencode(outbound)) + out_signature = hmac.new(key, out_payload, digestmod=hashlib.sha256).hexdigest() + out_query = urllib.urlencode({'sso': out_payload, 'sig' : out_signature}) + + return HttpResponseRedirect('%s?%s' % (return_url, out_query)) class TopicListView(ListView): context_object_name = "topics" diff --git a/wasa2il/local_settings.py-example b/wasa2il/local_settings.py-example index a504de8e..6e544b85 100644 --- a/wasa2il/local_settings.py-example +++ b/wasa2il/local_settings.py-example @@ -37,6 +37,12 @@ LANGUAGE_CODE = 'en-US' # For example 'en-US', 'en', 'is' etc... # 'key': 'some-random-string', #} +# Uncomment to enable Discourse SSO point +#DISCOURSE = { +# 'url': 'http://path-to-discourse', +# 'secret': 'something-random', +#} + AUTO_LOGOUT_DELAY = 30 # User is logged out after this many minutes. Comment to disable auto-logout. DATABASE_ENGINE = 'django.db.backends.' # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. diff --git a/wasa2il/urls.py b/wasa2il/urls.py index 90b14c4a..66d94ae0 100644 --- a/wasa2il/urls.py +++ b/wasa2il/urls.py @@ -33,6 +33,7 @@ # (r'^accounts/login/', 'django.contrib.auth.views.login', login_url_params), (r'^accounts/login/', 'core.views.login', login_url_params), (r'^accounts/verify/', 'core.views.verify'), + (r'^accounts/sso/', 'core.views.sso'), # - START OF TEMPORARY COMPATIBILITY HACK - # IMPORTANT! The entire ^accounts/password/ section is here as a temporary hack until the official django-registration gets fixed! From c7415e335a57b68e23a8fa7dca14bcc2212f8477 Mon Sep 17 00:00:00 2001 From: Helgi Hrafn Gunnarsson Date: Fri, 15 Jan 2016 18:55:14 +0000 Subject: [PATCH 003/993] Bugfix: Posting long comments to issues didn't work because it was being sent by GET. Is now sent by POST. --- wasa2il/core/ajax/issue.py | 4 ++-- wasa2il/core/static/js/wasa2il.js | 23 +++++++++++++++++++---- wasa2il/templates/core/issue_detail.html | 3 ++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/wasa2il/core/ajax/issue.py b/wasa2il/core/ajax/issue.py index 0bbdcc32..585ed332 100644 --- a/wasa2il/core/ajax/issue.py +++ b/wasa2il/core/ajax/issue.py @@ -31,8 +31,8 @@ def issue_vote(request): @login_required @jsonize def issue_comment_send(request): - issue = get_object_or_404(Issue, id=request.REQUEST.get("issue", 0)) - text = request.REQUEST.get("comment") + issue = get_object_or_404(Issue, id=request.POST.get("issue", 0)) + text = request.POST.get("comment") comment = Comment() comment.created_by = request.user comment.comment = text diff --git a/wasa2il/core/static/js/wasa2il.js b/wasa2il/core/static/js/wasa2il.js index 75688000..98319ed8 100755 --- a/wasa2il/core/static/js/wasa2il.js +++ b/wasa2il/core/static/js/wasa2il.js @@ -88,15 +88,30 @@ function elections_showclosed_toggle(polity_id) { function issue_comment_send(issue, comment) { comment_text = comment.val(); - if (comment_text == "") { return; } - $.getJSON("/api/issue/comment/send/", {"issue": issue, "comment": comment_text}, function(data) { + + if (comment_text == "") { + comment.focus(); + return; + } + + data = { + 'issue': issue, + 'comment': comment_text, + 'csrfmiddlewaretoken': $('.comment_form').find('input[name="csrfmiddlewaretoken"]').val(), + } + + $.post("/api/issue/comment/send/", data, null, 'json').done(function(data) { if (data.ok) { comment.val(""); issue_object = data.issue; issue_render(); - } else { - // Silent error reporting? + comment.focus(); + } + else { + alert('Error: Data was received but does not seem to be JSON'); } + }).fail(function(xhr, textStatus, errorThrown) { + alert("Error: " + errorThrown); }); } diff --git a/wasa2il/templates/core/issue_detail.html b/wasa2il/templates/core/issue_detail.html index ed0e033d..ae69eb45 100644 --- a/wasa2il/templates/core/issue_detail.html +++ b/wasa2il/templates/core/issue_detail.html @@ -60,11 +60,12 @@

{% trans "Discussion" %}

{% if issue.is_open and not user.is_anonymous %}
+ {% csrf_token %}
- +
{% endif %} From a1d1bf17cc7b18be361fa89e56b2eea52ef268c7 Mon Sep 17 00:00:00 2001 From: Helgi Hrafn Gunnarsson Date: Mon, 25 Jan 2016 19:55:34 +0000 Subject: [PATCH 004/993] Ability to change proposals before they're put to a vote --- wasa2il/core/ajax/document.py | 58 ++++++++++++++------- wasa2il/core/views.py | 51 +++++++++++------- wasa2il/templates/core/document_update.html | 20 +++++-- 3 files changed, 87 insertions(+), 42 deletions(-) diff --git a/wasa2il/core/ajax/document.py b/wasa2il/core/ajax/document.py index 653dd960..acc069d0 100644 --- a/wasa2il/core/ajax/document.py +++ b/wasa2il/core/ajax/document.py @@ -14,6 +14,7 @@ @jsonize def document_propose_change(request): ctx = {"ok": True} + version_num = int(request.POST.get('v', 0)) document = get_object_or_404(Document, id=request.POST.get("document_id", 0)) try: @@ -21,24 +22,45 @@ def document_propose_change(request): except KeyError: raise Exception('Missing "text"') - predecessor = document.preferred_version() - if predecessor and predecessor.text.strip() == text.strip(): - # This error message won't show anywhere. The same error is caught client-side to produce the error message. - raise Exception('Change proposal must differ from its predecessor') - - content = DocumentContent() - content.user = request.user - content.document = document - content.text = text - content.comments = request.POST.get('comments', '') - content.predecessor = predecessor - # TODO: Change this to a query that requests the maximum 'order' and adds to it. - try: - content.order = DocumentContent.objects.filter(document=document).order_by('-order')[0].order + 1 - except IndexError: - pass - - content.save() + if version_num == 0: + predecessor = document.preferred_version() + if predecessor and predecessor.text.strip() == text.strip(): + # This error message won't show anywhere. The same error is caught client-side to produce the error message. + raise Exception('Change proposal must differ from its predecessor') + + content = DocumentContent() + content.user = request.user + content.document = document + content.predecessor = predecessor + content.text = text + content.comments = request.POST.get('comments', '') + # TODO: Change this to a query that requests the maximum 'order' and adds to it. + try: + content.order = DocumentContent.objects.filter(document=document).order_by('-order')[0].order + 1 + except IndexError: + pass + + content.save() + + else: + try: + content = DocumentContent.objects.get( + document=document, + user=request.user.id, + order=version_num, + status='proposed', + issue=None + ) + content.text = text + content.comments = request.POST.get('comments', '') + + content.save() + except DocumentContent.DoesNotExist: + raise Exception('The user "%s" maliciously tried changing document "%s", version %d' % ( + request.user, + document, + version_num + )) ctx['order'] = content.order diff --git a/wasa2il/core/views.py b/wasa2il/core/views.py index 0f22848f..86f949aa 100644 --- a/wasa2il/core/views.py +++ b/wasa2il/core/views.py @@ -486,7 +486,7 @@ def form_valid(self, form): self.object.polity = self.polity self.object.user = self.request.user self.object.save() - self.success_url = "/polity/" + str(self.polity.id) + "/document/" + str(self.object.id) + "/?v=new" + self.success_url = "/polity/" + str(self.polity.id) + "/document/" + str(self.object.id) + "/?action=new" return HttpResponseRedirect(self.get_success_url()) @@ -505,31 +505,38 @@ def get_context_data(self, *args, **kwargs): context_data = super(DocumentDetailView, self).get_context_data(*args, **kwargs) context_data.update({'polity': self.polity}) - if 'v' in self.request.GET: - if self.request.GET['v'] == 'new': - context_data['editor_enabled'] = True + # Request variables taken together + action = self.request.GET.get('action', '') + try: + version_num = int(self.request.GET.get('v', 0)) + except ValueError: + raise Exception('Bad "v(ersion)" parameter') - current_content = DocumentContent() - current_content.order = 0 + # If version_num is not specified, we want the "preferred" version + if version_num > 0: + current_content = get_object_or_404(DocumentContent, document=doc, order=version_num) + else: + current_content = doc.preferred_version() - inherited_content = self.object.preferred_version() - if inherited_content: - current_content.text = inherited_content.text + issue = None + if current_content is not None and hasattr(current_content, 'issue'): + issue = current_content.issue - else: - try: - current_content = get_object_or_404(DocumentContent, document=doc, order=int(self.request.GET['v'])) - except ValueError: - raise Exception('Bad "v(ersion)" parameter') - else: - current_content = self.object.preferred_version() + if action == 'new': + context_data['editor_enabled'] = True - try: - issue = current_content.issue - except Issue.DoesNotExist: - issue = None + current_content = DocumentContent() + current_content.order = 0 + current_content.predecessor = doc.preferred_version() + + if current_content.predecessor: + current_content.text = current_content.predecessor.text + + elif action == 'edit': + if current_content.user.id == self.request.user.id and current_content.status == 'proposed' and issue is None: + context_data['editor_enabled'] = True user_is_member = self.request.user in self.polity.members.all() @@ -538,6 +545,7 @@ def get_context_data(self, *args, **kwargs): buttons = { 'propose_change': False, 'put_to_vote': False, + 'edit_proposal': False, } if not issue or not issue.is_voting(): if current_content.status == 'accepted': @@ -546,7 +554,10 @@ def get_context_data(self, *args, **kwargs): elif current_content.status == 'proposed': if user_is_officer and not issue: buttons['put_to_vote'] = 'disabled' if doc.has_open_issue() else 'enabled' + if current_content.user_id == self.request.user.id: + buttons['edit_proposal'] = 'disabled' if issue is not None else 'enabled' + context_data['action'] = action context_data['current_content'] = current_content context_data['selected_diff_documentcontent'] = doc.preferred_version context_data['issue'] = issue diff --git a/wasa2il/templates/core/document_update.html b/wasa2il/templates/core/document_update.html index 15b34250..e722db24 100644 --- a/wasa2il/templates/core/document_update.html +++ b/wasa2il/templates/core/document_update.html @@ -18,7 +18,7 @@ {% endblock %} From 0db21eb4f6f2b0a33a42bd21b8bf08b11557b781 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Sun, 7 Aug 2016 22:44:37 +0000 Subject: [PATCH 137/993] Create registration flow for pre-verified e-mail addresses --- core/models.py | 9 ++++ core/urls.py | 1 + gateway/register.py | 54 +++++++++++++++++++ gateway/urls.py | 6 ++- requirements.txt | 2 +- .../registration/data_disclaimer.html | 2 + wasa2il/templates/registration/login.html | 8 +++ .../registration/registration_form.html | 25 ++++++++- 8 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 gateway/register.py diff --git a/core/models.py b/core/models.py index be948cec..fe89f67f 100644 --- a/core/models.py +++ b/core/models.py @@ -13,6 +13,7 @@ from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ from django.utils import timezone +from registration.signals import user_registered from google_diff_match_patch.diff_match_patch import diff_match_patch @@ -65,6 +66,14 @@ def __unicode__(self): return u'Profile for %s (%d)' % (unicode(self.user), self.user.id) +# Make sure registration creates profiles +def _create_user_profile(**kwargs): + UserProfile.objects.get_or_create(user=kwargs['user']) + +user_registered.connect(_create_user_profile) + + +# Monkey-patch the User.get_name() method def get_name(user): name = "" if user: diff --git a/core/urls.py b/core/urls.py index d532ab23..127f9846 100644 --- a/core/urls.py +++ b/core/urls.py @@ -23,6 +23,7 @@ from core.models import Issue from core.models import Delegate + urlpatterns = patterns('', (r'^$', 'core.views.home'), (r'^polities/$', ListView.as_view(model=Polity, context_object_name="polities")), diff --git a/gateway/register.py b/gateway/register.py new file mode 100644 index 00000000..44943fe9 --- /dev/null +++ b/gateway/register.py @@ -0,0 +1,54 @@ +import hashlib +import time + +from django.conf import settings +from django.contrib.auth import logout +from registration.backends.simple.views import RegistrationView + + +class PreverifiedRegistrationView(RegistrationView): + """ + A registration backend which accepts e-mail addresses which have been + validated by icepirate and immediately creates a user. + """ + SIG_VALIDITY = 31 * 24 * 3600 + + def _make_email_sig(self, email, when=None): + ts = '%x/' % (when or time.time()) + key = settings.ICEPIRATE['key'] + return ts + hashlib.sha1( + '%s:%s%s:%s' % (key, ts, email, key)).hexdigest() + + def _email_sig_is_ok(self, email, email_sig): + try: + ts, sig = email_sig.split('/') + ts = int(ts, 16) + if time.time() - ts > self.SIG_VALIDITY: + return False + return email_sig == self._make_email_sig(email, when=ts) + except (AttributeError, ValueError, IndexError, KeyError): + return False + + def registration_allowed(self): + # Check if there is an email_sig variable that correctly signs + # the provided e-mail address. + + email = self.request.GET.get('email') + email2 = self.request.POST.get('email') + email_sig = self.request.GET.get('email_sig') + + if email2 is None and email_sig is None: + return True + elif (email2 in (None, email) + and self._email_sig_is_ok(email, email_sig)): + return RegistrationView.registration_allowed(self) + else: + return False + + def register(self, form): + new_user = RegistrationView.register(self, form) + logout(self.request) + return new_user + + def get_success_url(self, user=None): + return 'registration_activation_complete' diff --git a/gateway/urls.py b/gateway/urls.py index 53d62c05..7f0cc4a6 100644 --- a/gateway/urls.py +++ b/gateway/urls.py @@ -1,5 +1,9 @@ from django.conf.urls import patterns +from gateway.register import PreverifiedRegistrationView + + urlpatterns = patterns('', - (r'^icepirate/adduser/$', 'gateway.icepirate.adduser') + (r'^icepirate/adduser/$', 'gateway.icepirate.adduser'), + (r'^register/$', PreverifiedRegistrationView.as_view()) ) diff --git a/requirements.txt b/requirements.txt index a3f03f2b..85a1ba1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ defusedxml==0.4.1 diff-match-patch==20121119 Django==1.8.10 django-bootstrap-form==3.2 -django-registration-redux==1.2 +django-registration-redux==1.4 eight==0.3.3 enum34==1.1.2 future==0.15.2 diff --git a/wasa2il/templates/registration/data_disclaimer.html b/wasa2il/templates/registration/data_disclaimer.html index 39191c2d..d039f314 100644 --- a/wasa2il/templates/registration/data_disclaimer.html +++ b/wasa2il/templates/registration/data_disclaimer.html @@ -1,7 +1,9 @@ {% load i18n %}

{% trans "As of February 12th 2014, we require the verification of all user accounts via the so-called Icekey." %}

+{% if not request.GET.email %}

{% trans "Please be advised that by registering and verifying your account, you become a member of the Pirate Party of Iceland." %}

+{% endif %}

{% trans "Membership of political organizations is considered sensitive information by law." %}

{% trans "Therefore, you should keep the following in mind when becoming a member and using our system:" %}

    diff --git a/wasa2il/templates/registration/login.html b/wasa2il/templates/registration/login.html index 8243ac9f..4680b000 100644 --- a/wasa2il/templates/registration/login.html +++ b/wasa2il/templates/registration/login.html @@ -23,6 +23,14 @@ {% trans "Sign up" %} {% trans "Password reset" %} +{% if request.GET.username %} + + +{% endif %} diff --git a/wasa2il/templates/registration/registration_form.html b/wasa2il/templates/registration/registration_form.html index f5282405..38dbb20c 100644 --- a/wasa2il/templates/registration/registration_form.html +++ b/wasa2il/templates/registration/registration_form.html @@ -5,21 +5,37 @@ +{% if not request.GET.email %}
    {% include "registration/data_disclaimer.html" %}
    -
    +{% endif %}
    + {% if request.GET.email_sig and request.GET.email %} +
    + {% else %} + {% endif %} {%csrf_token%}
    {{ form|bootstrap }}
    + +{% if request.GET.email %} + + +{% endif %} + +
    @@ -28,4 +44,11 @@
    +{% if request.GET.email %} +
    +
    +{% include "registration/data_disclaimer.html" %} +
    +{% endif %} + {% endblock %} From 661b7960b757b88b3fb731303d07357018961ab3 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Sun, 7 Aug 2016 22:44:54 +0000 Subject: [PATCH 138/993] Fix buglet in icepirate gateway code --- gateway/icepirate.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gateway/icepirate.py b/gateway/icepirate.py index 9fae91dc..12bac119 100644 --- a/gateway/icepirate.py +++ b/gateway/icepirate.py @@ -43,10 +43,11 @@ def _icepirate_user_data(user, to_8bit=False): 'username': user.username, 'added': user.date_joined.strftime('%Y-%m-%d %H:%M:%S')} for f in ('name', 'username'): - if info.get(f) and not isinstance(info[f], unicode): - info[f] = info[f].decode('utf-8') - if to_8bit: - info[f] = info[f].encode('utf-8') + if info.get(f): + if not isinstance(info[f], unicode): + info[f] = info[f].decode('utf-8') + if to_8bit: + info[f] = info[f].encode('utf-8') return info def _make_username(name, email): From 10a6da2b9e9f2f1542d3be892ffcb6de345cd88f Mon Sep 17 00:00:00 2001 From: Icelandic Pirate Party Admins Date: Mon, 8 Aug 2016 10:34:56 +0000 Subject: [PATCH 139/993] Translate too late message --- wasa2il/locale/is/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasa2il/locale/is/LC_MESSAGES/django.po b/wasa2il/locale/is/LC_MESSAGES/django.po index 47a866f4..559400d6 100644 --- a/wasa2il/locale/is/LC_MESSAGES/django.po +++ b/wasa2il/locale/is/LC_MESSAGES/django.po @@ -1765,7 +1765,7 @@ msgstr "Vinsamlegast skráðu þig inn." #: wasa2il/templates/core/election_detail.html:41 msgid "You joined the organization too late." -msgstr "" +msgstr "Það er of stutt síðan þú gekkst í félagið." #: wasa2il/templates/core/election_detail.html:43 #: wasa2il/templates/core/election_detail.html:54 From 74c1e55829d3e820a4464b511a8535dda8b0721e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Baldur=20J=C3=B3nsson?= Date: Mon, 8 Aug 2016 20:03:56 +0000 Subject: [PATCH 140/993] Combine elections and display their state in entry view --- core/views.py | 3 +- wasa2il/templates/entry.html | 102 ++++------------------------------- 2 files changed, 10 insertions(+), 95 deletions(-) diff --git a/core/views.py b/core/views.py index 3255b52f..15e93766 100644 --- a/core/views.py +++ b/core/views.py @@ -69,8 +69,7 @@ def home(request): ctx["votingissues"] = Issue.objects.order_by("deadline_votes").filter(deadline_proposals__lt=datetime.now(),deadline_votes__gt=datetime.now(),polity__in=polities) ctx["openissues"] = Issue.objects.order_by("deadline_votes").filter(deadline_proposals__gt=datetime.now(),deadline_votes__gt=datetime.now(),polity__in=polities) - ctx["votingelections"] = Election.objects.order_by("deadline_votes").filter(deadline_candidacy__lt=datetime.now(),deadline_votes__gt=datetime.now(),polity__in=polities) - ctx["openelections"] = Election.objects.order_by("deadline_votes").filter(deadline_candidacy__gt=datetime.now(),deadline_votes__gt=datetime.now(),polity__in=polities) + ctx["elections"] = Election.objects.order_by("deadline_votes").filter(deadline_votes__gt=datetime.now(),polity__in=polities) return render_to_response("entry.html", ctx, context_instance=RequestContext(request)) diff --git a/wasa2il/templates/entry.html b/wasa2il/templates/entry.html index ef2d664e..fb8b21ab 100644 --- a/wasa2il/templates/entry.html +++ b/wasa2il/templates/entry.html @@ -4,8 +4,7 @@ {% load i18n %} {% load wasa2il %} -
    -
    +

    {% trans "Issues" %} {% trans "up for vote"%}

    {% trans "These are the issues up for vote." %}

    @@ -67,7 +66,7 @@

    {% trans "Issues" %} {% trans "up for vote"%}

    -
    +

    {% trans "Elections" %} {% trans "up for vote"%}

    {% trans "Sometimes you need to put people in their places. Elections do just that." %}

    @@ -77,59 +76,37 @@

    {% trans "Elections" %} {% trans "up for vote"%}

    {% trans "Election" %} {% trans "Polity" %} + {% trans "State" %} {% trans "Candidates" %} {% trans "Votes" %} - {% for election in votingelections|slice:"10" %} + {% for election in elections %} + {{ election.name }} {{ election.polity.name }} + {% if election.is_voting %}{% trans "Voting" %}{% else %}{% if election.is_open %}{% trans "Open" %}{% else %}{% trans "Closed" %}{% endif %}{% endif %} {{ election.candidate_set.count }} {{ election.get_vote_count }} {% empty %} - + {% trans "No elections are scheduled at the moment." %} {% endfor %} - {% if votingelections|length > 10 %} - - - {% trans "Show all" %} - - - {% for election in votingelections|slice:"10:" %} - - - {{ election.name }} - - - {{ election.polity.name }} - - {{ election.candidate_set.count }} - {{ election.get_vote_count }} - - {% endfor %} - - - {% trans "Show less" %} - - - {% endif %}
    -
    -
    -
    +

    {% trans "Issues" %} {% trans "in discussion"%}

    {% trans "These are the issues being discussed." %}

    @@ -194,67 +171,6 @@

    {% trans "Issues" %} {% trans "in discussion"%}

    -
    -

    {% trans "Elections" %} {% trans "open for candidacy" %}

    - -

    {% trans "Sometimes you need to put people in their places. Elections do just that." %}

    - - - - - - - - - - - - {% for election in openelections|slice:"10" %} - - - - - - - {% empty %} - - - - {% endfor %} - {% if openelections|length > 10 %} - - - - {% for election in openelections|slice:"10:" %} - - - - - - - {% endfor %} - - - - {% endif %} - -
    {% trans "Election" %}{% trans "Polity" %}{% trans "Candidates" %}{% trans "Votes" %}
    - {{ election.name }} - - {{ election.polity.name }} - {{ election.candidate_set.count }}{{ election.get_vote_count }}
    - {% trans "No elections are scheduled at the moment." %} -
    - {% trans "Show all" %} -
    -
    -
    {% endblock %} {% block head_extra %} From c1f6be8922781792549780f27279ed66e79d8063 Mon Sep 17 00:00:00 2001 From: Viktor Smari Date: Tue, 9 Aug 2016 18:08:14 +0200 Subject: [PATCH 141/993] UI: reorder voting buttons, return the X from menu --- core/static/css/application.css | 2 +- wasa2il/templates/core/_election_candidate_list.html | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/static/css/application.css b/core/static/css/application.css index 62efef36..37d0c1d3 100755 --- a/core/static/css/application.css +++ b/core/static/css/application.css @@ -98,7 +98,7 @@ textarea { } #vote { - padding-left: 20px; + padding-left: 7px; } #votes li { diff --git a/wasa2il/templates/core/_election_candidate_list.html b/wasa2il/templates/core/_election_candidate_list.html index 21cd7fe4..bc6e371b 100644 --- a/wasa2il/templates/core/_election_candidate_list.html +++ b/wasa2il/templates/core/_election_candidate_list.html @@ -21,6 +21,9 @@ + -
    - - {% trans "Remove" %} -
    -
    +
    - + {% endif %} {% else %} From aa498e933fb27f6f00e80302ba40262902fedcfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Baldur=20J=C3=B3nsson?= Date: Tue, 9 Aug 2016 21:04:29 +0000 Subject: [PATCH 142/993] make the entry template more modular and prepend it to /polities/ --- core/urls.py | 3 +- core/views.py | 21 +++ wasa2il/templates/_entry_summary.html | 187 +++++++++++++++++++++++ wasa2il/templates/core/polity_list.html | 1 + wasa2il/templates/entry.html | 190 +----------------------- 5 files changed, 211 insertions(+), 191 deletions(-) create mode 100644 wasa2il/templates/_entry_summary.html diff --git a/core/urls.py b/core/urls.py index 127f9846..31e55b3b 100644 --- a/core/urls.py +++ b/core/urls.py @@ -26,7 +26,7 @@ urlpatterns = patterns('', (r'^$', 'core.views.home'), - (r'^polities/$', ListView.as_view(model=Polity, context_object_name="polities")), + (r'^polities/$', PolityListView.as_view()), (r'^polity/new/$', login_required(PolityCreateView.as_view())), (r'^issue/(?P\d+)/edit/$', login_required(UpdateView.as_view(model=Issue, success_url="/issue/%(id)d/"))), @@ -78,4 +78,3 @@ (r'^api/documentcontent/render-diff/$', documentcontent_render_diff), ) - diff --git a/core/views.py b/core/views.py index 95c6b1ab..3aebcb06 100644 --- a/core/views.py +++ b/core/views.py @@ -451,6 +451,27 @@ def get_context_data(self, *args, **kwargs): return context_data +class PolityListView(ListView): + model = Polity + context_object_name = 'polities' + template_name = 'core/polity_list' + + def get_context_data(self, *args, **kwargs): + ctx = {} + context_data = super(PolityListView, self).get_context_data(*args, **kwargs) + + if self.request.user.is_authenticated(): + polities = self.request.user.polities.all() + else: + polities = Polity.objects.filter(is_nonmembers_readable=True) + + ctx["votingissues"] = Issue.objects.order_by("deadline_votes").filter(deadline_proposals__lt=datetime.now(),deadline_votes__gt=datetime.now(),polity__in=polities) + ctx["openissues"] = Issue.objects.order_by("deadline_votes").filter(deadline_proposals__gt=datetime.now(),deadline_votes__gt=datetime.now(),polity__in=polities) + ctx["elections"] = Election.objects.order_by("deadline_votes").filter(deadline_votes__gt=datetime.now(),polity__in=polities) + + context_data.update(ctx) + return context_data + class PolityDetailView(DetailView): model = Polity context_object_name = "polity" diff --git a/wasa2il/templates/_entry_summary.html b/wasa2il/templates/_entry_summary.html new file mode 100644 index 00000000..dbb09190 --- /dev/null +++ b/wasa2il/templates/_entry_summary.html @@ -0,0 +1,187 @@ +{% load i18n %} +{% load wasa2il %} +
    +

    {% trans "Issues" %} {% trans "up for vote"%}

    +

    {% trans "These are the issues up for vote." %}

    + + + + + + + + + + + {% for issue in votingissues|slice:"10" %} + + + + + + + {% empty %} + + + + {% endfor %} + {% if votingissues|length > 10 %} + + + + {% for issue in votingissues|slice:"10:" %} + + + + + + + {% endfor %} + + + + {% endif %} + +
    {% trans "Issue" %}{% trans "Polity" %}{% trans "Comments" %}{% trans "Votes" %}
    + + {{issue.name}} + + {{ issue.polity.name }} + {{ issue.comment_set.count }}{{ issue.get_votes.count }}
    + {% trans "There are no new issues at the moment." %} +
    + {% trans "Show all" %} +
    +
    +
    +

    {% trans "Elections" %} {% trans "up for vote"%}

    + +

    {% trans "Sometimes you need to put people in their places. Elections do just that." %}

    + + + + + + + + + + + + + {% for election in elections %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
    {% trans "Election" %}{% trans "Polity" %}{% trans "State" %}{% trans "Candidates" %}{% trans "Votes" %}
    + + {{ election.name }} + + {{ election.polity.name }} + {% if election.is_voting %}{% trans "Voting" %}{% else %}{% if election.is_open %}{% trans "Open" %}{% else %}{% trans "Closed" %}{% endif %}{% endif %}{{ election.candidate_set.count }}{{ election.get_vote_count }}
    + {% trans "No elections are scheduled at the moment." %} +
    +
    +
    +

    {% trans "Issues" %} {% trans "in discussion"%}

    + +

    {% trans "These are the issues being discussed." %}

    + + + + + + + + + + + + + {% for issue in openissues|slice:"10" %} + + + + + + + {% empty %} + + + + {% endfor %} + {% if openissues|length > 10 %} + + + + {% for issue in openissues|slice:"10:" %} + + + + + + + {% endfor %} + + + + {% endif %} + +
    {% trans "Issue" %}{% trans "Polity" %}{% trans "Comments" %}{% trans "Votes" %}
    + + {{issue.name}} + + {{ issue.polity.name }} + {{ issue.comment_set.count }}{{ issue.get_votes.count }}
    + {% trans "There are no new issues at the moment." %} +
    + {% trans "Show all" %} +
    +
    +{% block head_extra %} + +{% endblock %} diff --git a/wasa2il/templates/core/polity_list.html b/wasa2il/templates/core/polity_list.html index 28c5bbbe..13b18701 100644 --- a/wasa2il/templates/core/polity_list.html +++ b/wasa2il/templates/core/polity_list.html @@ -3,6 +3,7 @@ {% block content %} +{% include "_entry_summary.html" %} {% if user.is_staff %}
    {% trans "New polity" %} diff --git a/wasa2il/templates/entry.html b/wasa2il/templates/entry.html index fb8b21ab..495ffb08 100644 --- a/wasa2il/templates/entry.html +++ b/wasa2il/templates/entry.html @@ -1,193 +1,5 @@ {% extends 'base.html' %} {% block content %} - -{% load i18n %} -{% load wasa2il %} -
    -

    {% trans "Issues" %} {% trans "up for vote"%}

    -

    {% trans "These are the issues up for vote." %}

    - - - - - - - - - - - {% for issue in votingissues|slice:"10" %} - - - - - - - {% empty %} - - - - {% endfor %} - {% if votingissues|length > 10 %} - - - - {% for issue in votingissues|slice:"10:" %} - - - - - - - {% endfor %} - - - - {% endif %} - -
    {% trans "Issue" %}{% trans "Polity" %}{% trans "Comments" %}{% trans "Votes" %}
    - - {{issue.name}} - - {{ issue.polity.name }} - {{ issue.comment_set.count }}{{ issue.get_votes.count }}
    - {% trans "There are no new issues at the moment." %} -
    - {% trans "Show all" %} -
    -
    -
    -

    {% trans "Elections" %} {% trans "up for vote"%}

    - -

    {% trans "Sometimes you need to put people in their places. Elections do just that." %}

    - - - - - - - - - - - - - {% for election in elections %} - - - - - - - - {% empty %} - - - - {% endfor %} - -
    {% trans "Election" %}{% trans "Polity" %}{% trans "State" %}{% trans "Candidates" %}{% trans "Votes" %}
    - - {{ election.name }} - - {{ election.polity.name }} - {% if election.is_voting %}{% trans "Voting" %}{% else %}{% if election.is_open %}{% trans "Open" %}{% else %}{% trans "Closed" %}{% endif %}{% endif %}{{ election.candidate_set.count }}{{ election.get_vote_count }}
    - {% trans "No elections are scheduled at the moment." %} -
    -
    -
    -

    {% trans "Issues" %} {% trans "in discussion"%}

    - -

    {% trans "These are the issues being discussed." %}

    - - - - - - - - - - - - - {% for issue in openissues|slice:"10" %} - - - - - - - {% empty %} - - - - {% endfor %} - {% if openissues|length > 10 %} - - - - {% for issue in openissues|slice:"10:" %} - - - - - - - {% endfor %} - - - - {% endif %} - -
    {% trans "Issue" %}{% trans "Polity" %}{% trans "Comments" %}{% trans "Votes" %}
    - - {{issue.name}} - - {{ issue.polity.name }} - {{ issue.comment_set.count }}{{ issue.get_votes.count }}
    - {% trans "There are no new issues at the moment." %} -
    - {% trans "Show all" %} -
    -
    - -{% endblock %} -{% block head_extra %} - +{% include "_entry_summary.html" %} {% endblock %} From 74ed2cf62f050ec9454405851b169d604bfc0ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rgvin=20Ragnarsson?= Date: Wed, 10 Aug 2016 00:24:45 +0300 Subject: [PATCH 143/993] Fix .po file generation This commit replaces two of Django's management commands, makemessages and compilemessages with Python based implementations. Makemessages now scans wasa2il related files and skips the ones in virtualenv. Updated readme to guide contributors who modify strings. --- .gitignore | 1 + README.md | 6 ++++++ babel.cfg | 4 ++++ core/management/commands/compilemessages.py | 7 +++++++ core/management/commands/makemessages.py | 8 ++++++++ initial_setup.py | 5 +---- requirements.txt | 3 ++- 7 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 babel.cfg create mode 100644 core/management/commands/compilemessages.py create mode 100644 core/management/commands/makemessages.py diff --git a/.gitignore b/.gitignore index 5fe86814..79d015c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.pyc # Generated by django compilemessages utility *.mo +wasa2il/locale/wasa2il.pot *.swp *.swo pip-selfcheck.json diff --git a/README.md b/README.md index 5a73f46d..fd8f8546 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,12 @@ The 3rd step will populate the database with a small amount of random data, incl That should be it! +## Contributing + +Pull requests are welcome. Update translations by running **manage.py +makemessages** and edit the appropriate translation file, such as +`wasa2il/locale/is/LC_MESSAGES/django.po`. + # Project concepts ## Polities diff --git a/babel.cfg b/babel.cfg new file mode 100644 index 00000000..67fd8021 --- /dev/null +++ b/babel.cfg @@ -0,0 +1,4 @@ +[extractors] +django = django_babel.extract:extract_django +[python: core/**.py] +[django: wasa2il/templates/**] diff --git a/core/management/commands/compilemessages.py b/core/management/commands/compilemessages.py new file mode 100644 index 00000000..af8658ff --- /dev/null +++ b/core/management/commands/compilemessages.py @@ -0,0 +1,7 @@ +from django.core.management import BaseCommand +from babel.messages.frontend import CommandLineInterface + +class Command(BaseCommand): + def handle(self, *args, **options): + cli = CommandLineInterface() + cli.run("pybabel compile -d wasa2il/locale -D django".split(" ")) diff --git a/core/management/commands/makemessages.py b/core/management/commands/makemessages.py new file mode 100644 index 00000000..c34788cf --- /dev/null +++ b/core/management/commands/makemessages.py @@ -0,0 +1,8 @@ +from django.core.management import BaseCommand +from babel.messages.frontend import CommandLineInterface + +class Command(BaseCommand): + def handle(self, *args, **options): + cli = CommandLineInterface() + cli.run("pybabel extract -F babel.cfg -o wasa2il/locale/wasa2il.pot .".split(" ")) + cli.run("pybabel update -i wasa2il/locale/wasa2il.pot -d wasa2il/locale -D django".split(" ")) diff --git a/initial_setup.py b/initial_setup.py index cc790a9d..73e688eb 100755 --- a/initial_setup.py +++ b/initial_setup.py @@ -135,10 +135,7 @@ def get_answer(question, proper_answers=('yes','no')): stdout.write('- No changes needed.\n') # Compile the translation files -for lang in next(os.walk(os.path.join(os.getcwd(), 'wasa2il/locale')))[1]: - print [get_executable_path('pybabel'), 'compile', '-d', os.path.join(os.getcwd(), 'wasa2il/locale'), '-D', 'django', '-l', lang] - subprocess.call([get_executable_path('pybabel'), 'compile', '-d', os.path.join(os.getcwd(), 'wasa2il/locale'), '-D', 'django', '-l', lang]) - +subprocess.call([get_executable_path('python'), os.path.join(os.getcwd(), 'manage.py'), 'compilemessages']) # Setup database if needed create_database = False diff --git a/requirements.txt b/requirements.txt index e0ec1ee0..4c6aff05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,11 @@ -Babel==2.1.1 +Babel==2.3.4 certifi==2016.2.28 cffi==1.5.2 cryptography==1.3.1 defusedxml==0.4.1 diff-match-patch==20121119 Django==1.8.10 +django-babel==0.5.1 django-bootstrap-form==3.2 django-registration-redux==1.4 eight==0.3.3 From e402339d784b5a45bcfabcd54afd9b5ea36b9cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rgvin=20Ragnarsson?= Date: Wed, 10 Aug 2016 00:25:25 +0300 Subject: [PATCH 144/993] run manage.py makemessages + purge obsolete This shaves off plenty of translatable strings unrelated to wasa2il. --- wasa2il/locale/es/LC_MESSAGES/django.po | 2609 +++++++++++---------- wasa2il/locale/fr/LC_MESSAGES/django.po | 2607 +++++++++++---------- wasa2il/locale/is/LC_MESSAGES/django.po | 2778 +++++------------------ wasa2il/locale/nl/LC_MESSAGES/django.po | 2591 +++++++++++---------- wasa2il/locale/tr/LC_MESSAGES/django.po | 2607 +++++++++++---------- 5 files changed, 5981 insertions(+), 7211 deletions(-) diff --git a/wasa2il/locale/es/LC_MESSAGES/django.po b/wasa2il/locale/es/LC_MESSAGES/django.po index a2d3dfad..46092ef3 100644 --- a/wasa2il/locale/es/LC_MESSAGES/django.po +++ b/wasa2il/locale/es/LC_MESSAGES/django.po @@ -1,1343 +1,1211 @@ + msgid "" msgstr "" -"Project-Id-Version: wasa2il\n" +"Project-Id-Version: wasa2il\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-18 18:17+0000\n" +"POT-Creation-Date: 2016-08-10 10:13+0000\n" "PO-Revision-Date: 2012-12-15 18:20+0100\n" "Last-Translator: smari \n" +"Language: es\n" "Language-Team: Spanish\n" -"Language: es_ES\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: crowdin.net\n" +"Generated-By: Babel 2.3.4\n" + +#: core/authentication.py:57 core/forms.py:46 +msgid "E-mail" +msgstr "" + +#: core/authentication.py:58 +msgid "Password" +msgstr "" + +#: core/base_classes.py:8 core/models.py:46 +#: wasa2il/templates/forum/forum_detail.html:18 +msgid "Name" +msgstr "" + +#: core/forms.py:46 +msgid "The email address you'd like to use for the site." +msgstr "" + +#: core/forms.py:63 +msgid "Filename must contain file extension" +msgstr "" + +#: core/models.py:32 +msgid "Description" +msgstr "" + +#: core/models.py:46 +msgid "The name to display on the site." +msgstr "" + +#: core/models.py:47 +msgid "E-mail visible" +msgstr "" + +#: core/models.py:47 +msgid "Whether to display your email address on your profile page." +msgstr "" + +#: core/models.py:48 +msgid "Bio" +msgstr "" + +#: core/models.py:49 +msgid "Picture" +msgstr "" + +#: core/models.py:53 +msgid "Language" +msgstr "" + +#: core/models.py:54 +msgid "Whether to show all topics in a polity, or only starred." +msgstr "" + +#: core/models.py:170 +msgid "Officers" +msgstr "" + +#: core/models.py:172 +msgid "Publicly listed?" +msgstr "" + +#: core/models.py:172 +msgid "Whether the polity is publicly listed or not." +msgstr "" + +#: core/models.py:173 +msgid "Publicly viewable?" +msgstr "" + +#: core/models.py:173 +msgid "Whether non-members can view the polity and its activities." +msgstr "" + +#: core/models.py:174 +msgid "Can only officers make new issues?" +msgstr "" + +#: core/models.py:174 +msgid "" +"If this is checked, only officers can create new issues. If it's " +"unchecked, any member can start a new issue." +msgstr "" -#: core/models.py:357 templates/core/polity_detail.html:111 +#: core/models.py:175 +msgid "Front polity?" +msgstr "" + +#: core/models.py:175 +msgid "" +"If checked, this polity will be displayed on the front page. The first " +"created polity automatically becomes the front polity." +msgstr "" + +#: core/models.py:303 +msgid "Accepted at assembly" +msgstr "" + +#: core/models.py:304 +msgid "Rejected at assembly" +msgstr "" + +#: core/models.py:313 wasa2il/templates/core/polity_detail.html:24 +#: wasa2il/templates/core/polity_detail.html:107 +#: wasa2il/templates/core/polity_detail.html:114 +#: wasa2il/templates/core/polity_list.html:17 +msgid "Topics" +msgstr "Temas" + +#: core/models.py:319 +msgid "Ruleset" +msgstr "" + +#: core/models.py:321 wasa2il/templates/core/issue_detail.html:39 +msgid "Special process" +msgstr "" + +#: core/models.py:510 wasa2il/templates/core/issues_new.html:18 +#: wasa2il/templates/core/polity_detail.html:47 #, fuzzy msgid "Issue" msgstr "Asuntos" -#: core/models.py:361 +#: core/models.py:515 #, fuzzy msgid "Topic" msgstr "Temas" -#: core/models.py:365 templates/core/polity_list.html:14 +#: core/models.py:520 wasa2il/templates/core/polity_list.html:16 msgid "Polity" msgstr "Entidad" -#: templates/403.html:5 +#: core/models.py:659 +msgid "Proposed" +msgstr "" + +#: core/models.py:660 wasa2il/templates/core/issue_detail.html:49 +msgid "Accepted" +msgstr "" + +#: core/models.py:661 wasa2il/templates/core/issue_detail.html:49 +msgid "Rejected" +msgstr "" + +#: core/models.py:662 +msgid "Deprecated" +msgstr "" + +#: core/models.py:800 wasa2il/templates/core/election_detail.html:93 +msgid "Voting system" +msgstr "" + +#: core/models.py:801 wasa2il/templates/core/election_detail.html:74 +#: wasa2il/templates/core/election_list.html:19 +msgid "Deadline for candidacy" +msgstr "" + +#: core/models.py:802 +msgid "Start time for votes" +msgstr "" + +#: core/models.py:803 wasa2il/templates/core/election_detail.html:75 +#: wasa2il/templates/core/election_list.html:20 +#: wasa2il/templates/core/issue_detail.html:36 +msgid "Deadline for votes" +msgstr "" + +#: core/models.py:814 wasa2il/templates/core/election_detail.html:77 +msgid "Membership deadline" +msgstr "" + +#: core/models.py:817 wasa2il/templates/base.html:142 +msgid "Instructions" +msgstr "" + +#: core/views.py:423 +msgid "voting" +msgstr "" + +#: wasa2il/templates/403.html:5 msgid "403 Access Denied" msgstr "" -#: templates/404.html:5 +#: wasa2il/templates/404.html:5 msgid "404 File Not Found" msgstr "" -#: templates/base.html:7 -msgid "wassa2il" -msgstr "wassa2il" +#: wasa2il/templates/500.html:7 +msgid "Something bad happened!" +msgstr "" -#: templates/base.html:52 -msgid "‫وسائل" -msgstr "‫وسائل" +#: wasa2il/templates/500.html:9 +msgid "" +"A bunch of well-trained monkeys have been notified and they will take a " +"look at the problem as soon as possible." +msgstr "" -#: templates/base.html:65 templates/notLoginInHome.html:47 -#: templates/help/agreement.html:6 templates/help/authors.html:6 -#: templates/help/copyright.html:6 templates/help/index.html:6 -#: templates/help/polity.html:6 templates/help/proposal.html:6 -#: templates/help/wasa2il.html:6 +#: wasa2il/templates/500.html:11 +msgid "" +"Sometimes things break only for a few seconds, so it may work if you try " +"again." +msgstr "" + +#: wasa2il/templates/500.html:13 +msgid "Otherwise, please email us at" +msgstr "" + +#: wasa2il/templates/base.html:8 +msgid "Voting System - Pirate Party Iceland" +msgstr "" + +#: wasa2il/templates/base.html:91 wasa2il/templates/core/issue_detail.html:78 +msgid "There was an error while processing your vote. Please try again." +msgstr "" + +#: wasa2il/templates/base.html:94 +msgid "Your votes have been submitted!" +msgstr "" + +#: wasa2il/templates/base.html:95 +msgid "" +"You can continue adding, removing or reordering candidates until the " +"deadline." +msgstr "" + +#: wasa2il/templates/base.html:98 +#: wasa2il/templates/core/election_detail.html:175 +msgid "Working..." +msgstr "" + +#: wasa2il/templates/base.html:107 wasa2il/templates/help/is/agreement.html:6 +#: wasa2il/templates/help/is/authors.html:6 +#: wasa2il/templates/help/is/copyright.html:6 +#: wasa2il/templates/help/is/index.html:6 +#: wasa2il/templates/help/is/polity.html:6 +#: wasa2il/templates/help/is/proposal.html:6 +#: wasa2il/templates/help/is/wasa2il.html:6 msgid "Help" msgstr "Ayuda" -#: templates/base.html:69 +#: wasa2il/templates/base.html:113 msgid "My profile" msgstr "" -#: templates/base.html:70 +#: wasa2il/templates/base.html:114 #, fuzzy msgid "My settings" msgstr "Reuniones" -#: templates/base.html:71 +#: wasa2il/templates/base.html:116 +#: wasa2il/templates/registration/verification_needed.html:12 msgid "Logout" msgstr "Cerrar sesión" -#: templates/base.html:75 templates/hom01.html:18 -#: templates/registration/login.html:6 templates/registration/login.html:15 -#: templates/registration/password_reset_complete.html:9 +#: wasa2il/templates/base.html:120 wasa2il/templates/entry.html:17 +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/password_reset_complete.html:9 msgid "Log in" msgstr "Iniciar sesión" -#: templates/base.html:76 templates/hom01.html:12 -#: templates/notLoginInHome.html:14 templates/registration/login.html:16 +#: wasa2il/templates/base.html:121 wasa2il/templates/entry.html:11 +#: wasa2il/templates/registration/login.html:23 +#: wasa2il/templates/registration/registration_form.html:6 +#: wasa2il/templates/registration/registration_form.html:26 msgid "Sign up" msgstr "Registrarse" -#: templates/base.html:91 +#: wasa2il/templates/base.html:127 +msgid "Search agreements" +msgstr "" + +#: wasa2il/templates/base.html:139 msgid "Back to top" msgstr "Ir arriba" -#: templates/base.html:92 +#: wasa2il/templates/base.html:140 msgid "About wasa2il" msgstr "Acerca de" -#: templates/base.html:93 +#: wasa2il/templates/base.html:141 msgid "License" msgstr "Licencia" -#: templates/base.html:94 templates/help/authors.html:6 +#: wasa2il/templates/base.html:143 wasa2il/templates/help/is/authors.html:6 msgid "Authors" msgstr "Autores" -#: templates/hom01.html:13 +#: wasa2il/templates/entry.html:12 msgid "In order to use Wasa2il you need to register an account." msgstr "Para usar Wasa2il primero tienes que registrarte." -#: templates/hom01.html:19 +#: wasa2il/templates/entry.html:18 msgid "If you log in, you can participate in your polities." msgstr "Una vez inicies sesión, podrás participar en tus entidades." -#: templates/hom01.html:24 templates/notLoginInHome.html:33 +#: wasa2il/templates/entry.html:23 msgid "Browse Polities" msgstr "Buscar Entidades" -#: templates/hom01.html:25 +#: wasa2il/templates/entry.html:24 msgid "You can browse publicly visible polities without registering." msgstr "Puedes explorar las entidades públicamente visibles sin registrarte." -#: templates/hom01.html:35 -msgid "FAQ" -msgstr "Preguntas frecuentes" - -#: templates/hom01.html:37 templates/help/index.html:15 -msgid "What is a polity?" -msgstr "¿Qué es una entidad?" - -#: templates/hom01.html:38 -msgid "How electronic democracy work?" -msgstr "¿Cómo funciona la democracia electrónica?" - -#: templates/hom01.html:39 -msgid "Who can use Wasa2il?" -msgstr "¿Quién puede usar Wasa2il?" - -#: templates/hom01.html:40 -msgid "What does Wasa2il mean?" -msgstr "¿Qué significa Wasa2il?" - -#: templates/hom01.html:44 -msgid "New polities" -msgstr "Nuevas entidades" - -#: templates/hom01.html:52 -msgid "Recent decisions" -msgstr "Decisiones recientes" - -#: templates/home.html:8 -#, fuzzy -msgid "Your polities" -msgstr "Tus Entidades" - -#: templates/home.html:14 -#, fuzzy -msgid "Browse other polities" -msgstr "Buscar Entidades" - -#: templates/home.html:19 -#, fuzzy -msgid "Take Action!" -msgstr "Supuestos" - -#: templates/home.html:21 -#, fuzzy -msgid "Browse polities" -msgstr "Buscar Entidades" - -#: templates/home.html:22 -msgid "Edit your profile" -msgstr "" - -#: templates/home.html:23 -#, fuzzy -msgid "Create a polity" -msgstr "Abandonar esta entidad" - -#: templates/home.html:30 templates/core/issue_detail.html:66 -#, fuzzy -msgid "Your documents" -msgstr "Tus Documentos" - -#: templates/home.html:33 templates/home.html.py:51 -#: templates/core/topic_detail.html:63 -msgid "in" -msgstr "en" - -#: templates/home.html:39 -msgid "Recently adopted law" -msgstr "" - -#: templates/home.html:39 templates/home.html.py:48 -#, fuzzy -msgid "in your polities" -msgstr "Tus Entidades" - -#: templates/home.html:48 -#, fuzzy -msgid "New proposals" -msgstr "Retirar la propuesta" - -#: templates/notLoginInHome.html:23 -msgid "Start a Policy" -msgstr "Comenzar una Entidad" - -#: templates/notLoginInHome.html:49 -msgid "Join Code" -msgstr "Código de membresía" - -#: templates/notLoginInHome.html:51 -msgid "Free Software" -msgstr "Software libre" - -#: templates/profile.html:18 +#: wasa2il/templates/profile.html:19 msgid "Summary" msgstr "" -#: templates/profile.html:31 +#: wasa2il/templates/profile.html:39 msgid "This user hasn't provided a biography." msgstr "" -#: templates/profile.html:37 -msgid "This user has created:" +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +#: wasa2il/templates/profile.html:55 +msgid "Version" msgstr "" -#: templates/profile.html:40 -#, fuzzy -msgid "polities" -msgstr "Entidades" - -#: templates/profile.html:41 -#, fuzzy -msgid "issues" -msgstr "Asuntos" - -#: templates/profile.html:42 -msgid "documents" -msgstr "documentos" - -#: templates/profile.html:63 -msgid "is not viewable by non-members." -msgstr "" +#: wasa2il/templates/core/document_list.html:10 +#: wasa2il/templates/core/polity_list.html:18 wasa2il/templates/search.html:6 +msgid "Documents" +msgstr "Documentos" -#: templates/settings.html:7 -#: templates/registration/password_change_done.html:5 -#: templates/registration/password_change_form.html:5 +#: wasa2il/templates/registration/password_change_done.html:7 +#: wasa2il/templates/registration/password_change_form.html:7 +#: wasa2il/templates/settings.html:8 #, fuzzy msgid "Change password" msgstr "Retirar la propuesta" -#: templates/settings.html:8 +#: wasa2il/templates/settings.html:9 #, fuzzy msgid "Settings" msgstr "Reuniones" -#: templates/settings.html:9 +#: wasa2il/templates/settings.html:10 msgid "You are signed in as" msgstr "" -#: templates/settings.html:16 -#: templates/registration/password_change_form.html:10 -#: templates/registration/password_reset_confirm.html:13 -msgid "Submit" -msgstr "" +#: wasa2il/templates/core/document_form.html:18 +#: wasa2il/templates/core/document_update.html:121 +#: wasa2il/templates/core/election_form.html:35 +#: wasa2il/templates/core/issue_form.html:30 +#: wasa2il/templates/core/polity_form.html:13 +#: wasa2il/templates/core/topic_form.html:14 +#: wasa2il/templates/forum/discussion_form.html:16 +#: wasa2il/templates/forum/forum_form.html:17 +#: wasa2il/templates/registration/password_change_form.html:21 +#: wasa2il/templates/registration/password_reset_confirm.html:13 +#: wasa2il/templates/settings.html:19 +msgid "Save" +msgstr "Guardar" -#: templates/core/_delegations_table.html:4 +#: wasa2il/templates/core/_delegations_table.html:4 msgid "Type" msgstr "Tipo" -#: templates/core/_delegations_table.html:5 +#: wasa2il/templates/core/_delegations_table.html:5 msgid "Item" msgstr "" -#: templates/core/_delegations_table.html:6 +#: wasa2il/templates/core/_delegations_table.html:6 msgid "To" msgstr "" -#: templates/core/_delegations_table.html:7 +#: wasa2il/templates/core/_delegations_table.html:7 +#: wasa2il/templates/core/issue_detail.html:49 msgid "Result" msgstr "" -#: templates/core/_delegations_table.html:8 -#: templates/core/_delegations_table.html:16 -#: templates/core/delegate_detail.html:29 +#: wasa2il/templates/core/_delegations_table.html:8 +#: wasa2il/templates/core/_delegations_table.html:16 +#: wasa2il/templates/core/delegate_detail.html:29 msgid "Details" msgstr "" -#: templates/core/_delegations_table.html:21 +#: wasa2il/templates/core/_delegations_table.html:21 #, fuzzy msgid "There are no delegations" msgstr "¡Todavía no hay ningún documento!" -#: templates/core/_delegations_table.html:22 +#: wasa2il/templates/core/_delegations_table.html:22 #, fuzzy msgid "What is a delegation?" msgstr "¿Qué es un tema?" -#: templates/core/_document_agreement_list_table.html:4 -#: templates/core/_document_list_table.html:4 -#: templates/core/_document_proposals_list_table.html:4 +#: wasa2il/templates/core/_document_agreement_list_table.html:4 +#: wasa2il/templates/core/_document_list_table.html:4 +#: wasa2il/templates/core/_document_proposals_list_table.html:4 msgid "Document" msgstr "Documento" -#: templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/issue_detail.html:44 +#: wasa2il/templates/core/issue_detail.html:80 +msgid "Yes" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:6 +#: wasa2il/templates/core/issue_detail.html:45 +#: wasa2il/templates/core/issue_detail.html:82 +msgid "No" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:7 +#: wasa2il/templates/core/issue_detail.html:81 +msgid "Abstain" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:8 msgid "Adopted" msgstr "Aprobado" -#: templates/core/_document_agreement_list_table.html:15 +#: wasa2il/templates/core/_document_agreement_list_table.html:27 msgid "This polity has no agreements." msgstr "Esta entidad no ha llegado aún a ningún acuerdo." -#: templates/core/_document_agreement_list_table.html:16 -#: templates/help/polity.html:119 templates/help/proposal.html:64 +#: wasa2il/templates/core/_document_agreement_list_table.html:28 +#: wasa2il/templates/help/is/polity.html:119 +#: wasa2il/templates/help/is/proposal.html:64 msgid "What is an agreement?" msgstr "¿Qué es un acuerdo?" -#: templates/core/_document_list_table.html:5 +#: wasa2il/templates/core/_document_list_table.html:5 msgid "Adopted?" msgstr "¿Aprobado?" -#: templates/core/_document_list_table.html:6 +#: wasa2il/templates/core/_document_list_table.html:6 msgid "Original author" msgstr "Autor original" -#: templates/core/_document_list_table.html:7 +#: wasa2il/templates/core/_document_list_table.html:7 msgid "Contributors" msgstr "Colaboradores" -#: templates/core/_document_list_table.html:8 -#: templates/core/_document_proposals_list_table.html:5 +#: wasa2il/templates/core/_document_list_table.html:8 +#: wasa2il/templates/core/_document_proposals_list_table.html:5 msgid "Last edit" msgstr "Última edición" -#: templates/core/_document_list_table.html:21 -#: templates/core/_document_proposals_list_table.html:17 +#: wasa2il/templates/core/_document_list_table.html:21 +#: wasa2il/templates/core/_document_proposals_list_table.html:17 msgid "There are no documents here!" msgstr "¡Todavía no hay ningún documento!" -#: templates/core/_document_proposals_list_table.html:6 +#: wasa2il/templates/core/_document_modal.html:6 +#, python-format +msgid "New %(type_name)s" +msgstr "" + +#: wasa2il/templates/core/_document_modal.html:11 +msgid "Choose a document to reference" +msgstr "" + +#: wasa2il/templates/core/_document_modal.html:22 +msgid "Write assumption:" +msgstr "Escribe aquí el supuesto:" + +#: wasa2il/templates/core/_document_modal.html:41 +#, fuzzy +msgid "Statements:" +msgstr "Guardar afirmación" + +#: wasa2il/templates/core/_document_modal.html:49 +#: wasa2il/templates/core/polity_detail.html:148 +#: wasa2il/templates/core/topic_detail.html:72 +#: wasa2il/templates/forum/forum_detail.html:48 +msgid "Close" +msgstr "Cerrar" + +#: wasa2il/templates/core/_document_modal.html:50 +#, python-format +msgid "Save %(type_name)s" +msgstr "" + +#: wasa2il/templates/core/_document_proposals_list_table.html:6 #, fuzzy msgid "Actions" msgstr "Supuestos" -#: templates/core/_document_proposals_list_table.html:12 +#: wasa2il/templates/core/_document_proposals_list_table.html:12 #, fuzzy msgid "Propose" msgstr "¿Propuesto?" -#: templates/core/_documentsMenu.html:5 +#: wasa2il/templates/core/_documentsMenu.html:5 msgid "Your Documents" msgstr "Tus Documentos" -#: templates/core/_documentsMenu.html:19 +#: wasa2il/templates/core/_documentsMenu.html:19 msgid "Proposed Documents" msgstr "Documentos Propuestos" -#: templates/core/_documentsMenu.html:33 +#: wasa2il/templates/core/_documentsMenu.html:33 msgid "Adopted documents" msgstr "Documentos Aprobados" -#: templates/core/_election_candidate_list.html:12 -msgid "Drag candidates here." +#: wasa2il/templates/core/_election_candidate_list.html:23 +#: wasa2il/templates/core/issue_detail.html:77 +#, fuzzy +msgid "Vote" +msgstr "Votos" + +#: wasa2il/templates/core/_election_candidate_list.html:34 +msgid "Your ballot is empty." +msgstr "" + +#: wasa2il/templates/core/_election_candidate_list.html:35 +msgid "Drag candidates here or click the vote buttons." +msgstr "" + +#: wasa2il/templates/core/_election_candidate_list.html:38 +msgid "You have selected all the candidates, good work!" msgstr "" -#: templates/core/_election_candidate_list.html:14 +#: wasa2il/templates/core/_election_candidate_list.html:40 #, fuzzy msgid "There are no candidates standing in this election yet!" msgstr "¡Todavía no hay ningún tema en esta entidad!" -#: templates/core/_politiesMenu.html:4 -msgid "Your Polities" -msgstr "Tus Entidades" +#: wasa2il/templates/core/_election_list_table.html:8 +#, fuzzy +msgid "You have voted in this election" +msgstr "¡Todavía no hay ningún tema en esta entidad!" + +#: wasa2il/templates/core/_election_list_table.html:8 +#, fuzzy +msgid "You have not voted in this election" +msgstr "¡Todavía no hay ningún tema en esta entidad!" -#: templates/core/_politiesMenu.html:18 -msgid "Other Polities" -msgstr "Otras Entidades" +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +#: wasa2il/templates/core/topic_detail.html:34 +#, fuzzy +msgid "Voting" +msgstr "Asuntos en votación" + +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +#: wasa2il/templates/core/topic_detail.html:34 +msgid "Open" +msgstr "" + +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/topic_detail.html:34 +#, fuzzy +msgid "Closed" +msgstr "Cerrar" + +#: wasa2il/templates/core/_election_list_table.html:18 +msgid "No elections are scheduled at the moment." +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:8 +#: wasa2il/templates/core/election_form.html:28 +#, fuzzy +msgid "New election" +msgstr "Nueva reunión" -#: templates/core/_topic_list_table.html:17 +#: wasa2il/templates/core/_polity_detail_elections.html:13 +msgid "Show closed elections" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:14 +msgid "Show all elections" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +#: wasa2il/templates/core/polity_detail.html:25 +#, fuzzy +msgid "Elections" +msgstr "Supuestos" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +msgid "putting people in power" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:20 +msgid "Sometimes you need to put people in their places. Elections do just that." +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:25 +#: wasa2il/templates/core/election_list.html:15 +#, fuzzy +msgid "Election" +msgstr "Supuestos" + +#: wasa2il/templates/core/_polity_detail_elections.html:26 +#: wasa2il/templates/core/election_list.html:16 +#: wasa2il/templates/core/issues_new.html:19 +#: wasa2il/templates/core/polity_detail.html:48 +#: wasa2il/templates/core/topic_detail.html:22 +msgid "State" +msgstr "Estado" + +#: wasa2il/templates/core/_polity_detail_elections.html:27 +#: wasa2il/templates/core/election_detail.html:91 +#: wasa2il/templates/core/election_detail.html:172 +#: wasa2il/templates/core/election_list.html:17 +msgid "Candidates" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:28 +#: wasa2il/templates/core/election_detail.html:89 +#: wasa2il/templates/core/election_detail.html:148 +#: wasa2il/templates/core/election_list.html:18 +#: wasa2il/templates/core/issue_detail.html:42 +#: wasa2il/templates/core/issues_new.html:21 +#: wasa2il/templates/core/polity_detail.html:50 +#: wasa2il/templates/core/topic_detail.html:24 +msgid "Votes" +msgstr "Votos" + +#: wasa2il/templates/core/_topic_list_table.html:19 msgid "There are no topics in this polity!" msgstr "¡Todavía no hay ningún tema en esta entidad!" -#: templates/core/delegate_detail.html:6 -#: templates/core/document_detail.html:14 -#: templates/core/election_detail.html:6 templates/core/issue_detail.html:6 -#: templates/core/meeting_detail.html:16 templates/core/topic_detail.html:7 -#: templates/forum/discussion_detail.html:6 -#: templates/forum/forum_detail.html:7 +#: wasa2il/templates/core/_topic_list_table.html:20 +msgid "Start a new topic" +msgstr "" + +#: wasa2il/templates/core/delegate_detail.html:6 +#: wasa2il/templates/core/document_detail.html:14 +#: wasa2il/templates/core/election_detail.html:31 +#: wasa2il/templates/core/election_list.html:8 +#: wasa2il/templates/core/issue_detail.html:6 +#: wasa2il/templates/core/issues_new.html:8 +#: wasa2il/templates/core/topic_detail.html:7 +#: wasa2il/templates/forum/discussion_detail.html:6 +#: wasa2il/templates/forum/forum_detail.html:7 msgid "Back to polity" msgstr "Volver a la entidad" -#: templates/core/delegate_detail.html:8 +#: wasa2il/templates/core/delegate_detail.html:8 #, fuzzy msgid "Delegation:" msgstr "Declaraciones" -#: templates/core/delegate_detail.html:8 +#: wasa2il/templates/core/delegate_detail.html:8 msgid "to" msgstr "" -#: templates/core/delegate_detail.html:13 +#: wasa2il/templates/core/delegate_detail.html:13 #, fuzzy msgid "Stop delegating" msgstr "Comenzar la reunión" -#: templates/core/delegate_detail.html:14 +#: wasa2il/templates/core/delegate_detail.html:14 msgid "Change delegation" msgstr "" -#: templates/core/delegate_detail.html:33 +#: wasa2il/templates/core/delegate_detail.html:33 msgid "Delegation type" msgstr "" -#: templates/core/delegate_detail.html:37 +#: wasa2il/templates/core/delegate_detail.html:37 #, fuzzy msgid "Delegated item" msgstr "Punto siguiente de la agenda" -#: templates/core/delegate_detail.html:41 +#: wasa2il/templates/core/delegate_detail.html:41 #, fuzzy msgid "Delegated to user" msgstr "Relacionado con el asunto:" -#: templates/core/delegate_detail.html:45 +#: wasa2il/templates/core/delegate_detail.html:45 msgid "Resulting delegation" msgstr "" -#: templates/core/delegate_detail.html:54 +#: wasa2il/templates/core/delegate_detail.html:54 msgid "Pathway breakdown" msgstr "" -#: templates/core/document_detail.html:8 templates/core/document_update.html:8 +#: wasa2il/templates/core/document_detail.html:8 msgid "Withdraw proposal" msgstr "Retirar la propuesta" -#: templates/core/document_detail.html:10 -#: templates/core/document_update.html:10 +#: wasa2il/templates/core/document_detail.html:10 msgid "Propose this document" msgstr "Proponer este documento" -#: templates/core/document_detail.html:13 +#: wasa2il/templates/core/document_detail.html:13 msgid "Edit this document" msgstr "Editar este documento" -#: templates/core/document_detail.html:22 +#: wasa2il/templates/core/document_detail.html:22 msgid "Assumptions" msgstr "Supuestos" -#: templates/core/document_detail.html:36 +#: wasa2il/templates/core/document_detail.html:36 msgid "Declarations" msgstr "Declaraciones" -#: templates/core/document_form.html:4 +#: wasa2il/templates/core/document_form.html:6 msgid "New Document" msgstr "Nuevo documento" -#: templates/core/document_form.html:6 +#: wasa2il/templates/core/document_form.html:9 msgid "In polity:" msgstr "En la entidad:" -#: templates/core/document_form.html:9 -msgid "Related to issues:" -msgstr "Relacionado con los siguientes asuntos:" - -#: templates/core/document_form.html:9 -msgid "Related to issue:" -msgstr "Relacionado con el asunto:" - -#: templates/core/document_form.html:22 templates/core/issue_form.html:12 -#: templates/forum/discussion_form.html:16 templates/forum/forum_form.html:17 -msgid "Save" -msgstr "Guardar" - -#: templates/core/document_list.html:7 templates/core/issue_detail.html:53 -#: templates/core/polity_detail.html:294 +#: wasa2il/templates/core/document_list.html:7 +#: wasa2il/templates/core/polity_detail.html:83 msgid "New document" msgstr "Nuevo documento" -#: templates/core/document_list.html:10 templates/core/issue_detail.html:56 -#: templates/core/polity_detail.html:113 templates/core/polity_list.html:17 -#: templates/core/topic_detail.html:30 -msgid "Documents" -msgstr "Documentos" +#: wasa2il/templates/core/document_update.html:15 +msgid "Change proposal must differ from its predecessor." +msgstr "" -#: templates/core/document_update.html:15 +#: wasa2il/templates/core/document_update.html:88 msgid "Agreement" msgstr "Acuerdo" -#: templates/core/document_update.html:16 +#: wasa2il/templates/core/document_update.html:90 +#: wasa2il/templates/core/issue_detail.html:22 msgid "Proposal" msgstr "Propuesta" -#: templates/core/document_update.html:17 -msgid "Draft proposal:" -msgstr "Propuesta de borrador:" - -#: templates/core/document_update.html:48 -msgid "Referenced by issues" -msgstr "Mencionado en asuntos" - -#: templates/core/document_update.html:56 -msgid "Contributors to this document" -msgstr "Colaboradores en este documento" - -#: templates/core/document_update.html:65 -#: templates/core/meeting_detail.html:36 -#: templates/core/meeting_detail.html:101 -msgid "Add" -msgstr "Añadir" - -#: templates/core/document_update.html:73 -#: templates/core/document_update.html:132 -msgid "New reference" -msgstr "Nueva referencia" - -#: templates/core/document_update.html:74 -#: templates/core/document_update.html:154 -msgid "New assumption" -msgstr "Nuevo supuesto" - -#: templates/core/document_update.html:75 -#: templates/core/document_update.html:172 -msgid "New statement" -msgstr "Nueva afirmación" - -#: templates/core/document_update.html:76 -#: templates/core/document_update.html:189 -msgid "New subheading" -msgstr "Nuevo subtítulo" +#: wasa2il/templates/core/document_update.html:115 +#: wasa2il/templates/core/document_update.html:192 +#: wasa2il/templates/core/issues_new.html:20 +#: wasa2il/templates/core/polity_detail.html:49 +#: wasa2il/templates/core/topic_detail.html:23 +msgid "Comments" +msgstr "Comentarios" -#: templates/core/document_update.html:77 -msgid "Import structure" +#: wasa2il/templates/core/document_update.html:115 +msgid "optional" msgstr "" -#: templates/core/document_update.html:82 -#: templates/core/document_update.html:89 -msgid "Please note:" +#: wasa2il/templates/core/document_update.html:120 +msgid "Preview" msgstr "" -#: templates/core/document_update.html:83 -msgid "This document has been proposed." +#: wasa2il/templates/core/document_update.html:123 +msgid "Preview is required before saving" msgstr "" -#: templates/core/document_update.html:84 -msgid "" -"Changes you make to it now will become change proposals, which will be voted " -"on individually." -msgstr "" +#: wasa2il/templates/core/document_update.html:127 +#: wasa2il/templates/core/document_update.html:129 +#: wasa2il/templates/registration/password_change_form.html:20 +msgid "Cancel" +msgstr "Cancelar" -#: templates/core/document_update.html:90 -msgid "This document has been adopted." +#: wasa2il/templates/core/document_update.html:136 +msgid "Propose change" msgstr "" -#: templates/core/document_update.html:91 -msgid "" -"In order to make change proposals to it, you must import it into a new open " -"issue." +#: wasa2il/templates/core/document_update.html:141 +#: wasa2il/templates/core/document_update.html:143 +msgid "Edit proposal" msgstr "" -#: templates/core/document_update.html:100 -#, fuzzy -msgid "Change proposals" -msgstr "Retirar la propuesta" - -#: templates/core/document_update.html:105 -#, fuzzy -msgid "Deleted" -msgstr "Borrar" - -#: templates/core/document_update.html:108 -msgid "Moved" +#: wasa2il/templates/core/document_update.html:149 +#: wasa2il/templates/core/document_update.html:151 +msgid "Put to vote" msgstr "" -#: templates/core/document_update.html:115 -msgid "Added at beginning" +#: wasa2il/templates/core/document_update.html:170 +msgid "Referenced issue" msgstr "" -#: templates/core/document_update.html:117 -msgid "Added after:" +#: wasa2il/templates/core/document_update.html:186 +msgid "Versions" msgstr "" -#: templates/core/document_update.html:135 -msgid "Choose a document to reference:" -msgstr "Elije un documento al que referir:" - -#: templates/core/document_update.html:145 -#: templates/core/document_update.html:163 -#: templates/core/document_update.html:180 -#: templates/core/document_update.html:197 -#: templates/core/document_update.html:215 -#: templates/core/issue_detail.html:117 templates/core/polity_detail.html:327 -#: templates/core/polity_detail.html:363 templates/core/topic_detail.html:87 -#: templates/forum/forum_detail.html:48 -msgid "Close" -msgstr "Cerrar" - -#: templates/core/document_update.html:146 -msgid "Save reference" -msgstr "Guardar referencia" - -#: templates/core/document_update.html:157 -msgid "Write assumption:" -msgstr "Escribe aquí el supuesto:" - -#: templates/core/document_update.html:164 -msgid "Save assumption" -msgstr "Guardar supuesto" - -#: templates/core/document_update.html:181 -msgid "Save statement" -msgstr "Guardar afirmación" - -#: templates/core/document_update.html:198 -msgid "Save subheading" -msgstr "Guardar subtítulo" - -#: templates/core/document_update.html:206 -#, fuzzy -msgid "Import statements" -msgstr "Nueva afirmación" - -#: templates/core/document_update.html:209 -#, fuzzy -msgid "Statements:" -msgstr "Guardar afirmación" - -#: templates/core/document_update.html:216 -#, fuzzy -msgid "Import" -msgstr "Apoyar" - -#: templates/core/document_update.html:228 -#, fuzzy -msgid "Add reference" -msgstr "Nueva referencia" - -#: templates/core/document_update.html:229 -#, fuzzy -msgid "Add assumption" -msgstr "Supuestos" - -#: templates/core/document_update.html:231 -#, fuzzy -msgid "Add statement" -msgstr "Nueva afirmación" +#: wasa2il/templates/core/document_update.html:190 +msgid "Status" +msgstr "Estado" -#: templates/core/document_update.html:232 -#, fuzzy -msgid "Add subheading" -msgstr "Nuevo subtítulo" +#: wasa2il/templates/core/document_update.html:191 +msgid "Author" +msgstr "" -#: templates/core/document_update.html:238 -msgid "Delete" -msgstr "Borrar" +#: wasa2il/templates/core/document_update.html:210 +msgid "New draft" +msgstr "" -#: templates/core/election_detail.html:8 +#: wasa2il/templates/core/election_detail.html:33 #, fuzzy msgid "Election:" msgstr "Declaraciones" -#: templates/core/election_detail.html:11 +#: wasa2il/templates/core/election_detail.html:36 #, fuzzy msgid "This election is closed." msgstr "La reunión ya ha empezado." -#: templates/core/election_detail.html:15 -#, fuzzy -msgid "This election is delegated." -msgstr "Esta entidad no ha llegado aún a ningún acuerdo." - -#: templates/core/election_detail.html:15 templates/core/issue_detail.html:15 -#: templates/core/polity_detail.html:31 templates/core/topic_detail.html:15 -msgid "View details." +#: wasa2il/templates/core/election_detail.html:39 +msgid "You cannot vote in this election:" msgstr "" -#: templates/core/election_detail.html:23 -#, fuzzy -msgid "Deadline for candidacy:" -msgstr "Propuesta de borrador:" - -#: templates/core/election_detail.html:24 templates/core/issue_detail.html:26 -msgid "Deadline for votes:" -msgstr "" - -#: templates/core/election_detail.html:25 templates/core/issue_detail.html:29 -#, fuzzy -msgid "Votes:" -msgstr "Votos" - -#: templates/core/election_detail.html:26 -msgid "Candidates:" -msgstr "" - -#: templates/core/election_detail.html:27 -#, fuzzy -msgid "Voting system:" -msgstr "Asuntos en votación" - -#: templates/core/election_detail.html:39 -#: templates/core/polity_detail.html:159 -msgid "Candidates" +#: wasa2il/templates/core/election_detail.html:41 +#: wasa2il/templates/core/election_detail.html:54 +msgid "Please log in." msgstr "" -#: templates/core/election_detail.html:39 -msgid "running in this election" +#: wasa2il/templates/core/election_detail.html:43 +msgid "You joined the organization too late." msgstr "" -#: templates/core/election_detail.html:50 templates/core/issue_detail.html:38 -#, fuzzy -msgid "Vote" -msgstr "Votos" - -#: templates/core/election_detail.html:50 -msgid "for the candidates standing in this election" -msgstr "" - -#: templates/core/election_detail.html:51 templates/core/issue_detail.html:39 -msgid "There was an error while processing your vote. Please try again." -msgstr "" - -#: templates/core/issue_detail.html:11 -msgid "This issue is closed." -msgstr "" - -#: templates/core/issue_detail.html:15 -msgid "This issue is delegated." -msgstr "" - -#: templates/core/issue_detail.html:23 -#, fuzzy -msgid "In topics:" -msgstr "temas" - -#: templates/core/issue_detail.html:25 -#, fuzzy -msgid "Deadline for proposals:" -msgstr "Propuesta de borrador:" - -#: templates/core/issue_detail.html:30 -msgid "Yes:" +#: wasa2il/templates/core/election_detail.html:45 +#: wasa2il/templates/core/election_detail.html:56 +msgid "You are not a member of this polity." msgstr "" -#: templates/core/issue_detail.html:31 -msgid "No:" +#: wasa2il/templates/core/election_detail.html:47 +#: wasa2il/templates/core/election_detail.html:58 +msgid "You do not meet the requirements." msgstr "" -#: templates/core/issue_detail.html:38 -msgid "for or against the documents in this issue" +#: wasa2il/templates/core/election_detail.html:52 +msgid "You cannot run in this election:" msgstr "" -#: templates/core/issue_detail.html:41 -msgid "Yes" -msgstr "" - -#: templates/core/issue_detail.html:42 -msgid "Abstain" -msgstr "" - -#: templates/core/issue_detail.html:43 -msgid "No" -msgstr "" - -#: templates/core/issue_detail.html:45 -#, fuzzy -msgid "Voting closes in" -msgstr "Asuntos en votación" - -#: templates/core/issue_detail.html:52 templates/core/issue_detail.html:103 -#, fuzzy -msgid "Import agreement" -msgstr "Acuerdo" - -#: templates/core/issue_detail.html:56 -msgid "proposed or in progress" -msgstr "propuesto o en elaboración" - -#: templates/core/issue_detail.html:57 -msgid "" -"Documents are structured texts which contain the laws of the polity, or " -"proposals for such laws." -msgstr "" -"Los documentos son textos estructurados que contienen las distintas leyes de " -"la entidad, o propuestas para tales leyes." - -#: templates/core/issue_detail.html:58 -#, fuzzy -msgid "Proposed documents" -msgstr "Documentos Propuestos" - -#: templates/core/issue_detail.html:67 -msgid "Documents you are working on that haven't been proposed:" -msgstr "" - -#: templates/core/issue_detail.html:78 -#: templates/forum/discussion_detail.html:9 -msgid "Discussion" -msgstr "Discusión" - -#: templates/core/issue_detail.html:85 -#: templates/forum/discussion_detail.html:23 -msgid "Add comment" -msgstr "Añadir comentario" - -#: templates/core/issue_detail.html:106 +#: wasa2il/templates/core/election_detail.html:65 #, fuzzy -msgid "Choose an agreement to import:" -msgstr "Elije un documento al que referir:" +msgid "This election is delegated." +msgstr "Esta entidad no ha llegado aún a ningún acuerdo." -#: templates/core/issue_detail.html:114 -msgid "" -"The purpose of importing an agreement to an issue is to be able to propose " -"changes to it." +#: wasa2il/templates/core/election_detail.html:65 +#: wasa2il/templates/core/topic_detail.html:12 +msgid "View details." msgstr "" -#: templates/core/issue_detail.html:118 -msgid "Import document to issue" +#: wasa2il/templates/core/election_detail.html:73 +msgid "Voting begins" msgstr "" -#: templates/core/issue_form.html:5 templates/core/polity_detail.html:72 -#: templates/core/topic_detail.html:9 -msgid "New issue" -msgstr "Nuevo asunto" - -#: templates/core/meeting_detail.html:21 -msgid "Attendance list" -msgstr "Lista de asistentes" - -#: templates/core/meeting_detail.html:23 -msgid "Attend meeting" -msgstr "Asistir" - -#: templates/core/meeting_detail.html:25 -msgid "You can sign in to attendance when the meeting has started." -msgstr "Podrás marcar que has asistido una vez que la reunión haya comenzado." - -#: templates/core/meeting_detail.html:29 -msgid "Meeting managers" -msgstr "Organizadores de la reunión" - -#: templates/core/meeting_detail.html:41 -msgid "This meeting will start in" -msgstr "La reunión empieza en" - -#: templates/core/meeting_detail.html:42 -msgid "This meeting is ongoing." -msgstr "La reunión ya ha empezado." - -#: templates/core/meeting_detail.html:43 -msgid "This meeting ended at" -msgstr "La reunión acabó a las" - -#: templates/core/meeting_detail.html:51 -msgid "Ajourn meeting" -msgstr "Ajourn meeting" - -#: templates/core/meeting_detail.html:52 -msgid "Start meeting" -msgstr "Comenzar la reunión" - -#: templates/core/meeting_detail.html:57 -msgid "Close agenda" -msgstr "Cerrar agenda" - -#: templates/core/meeting_detail.html:60 -msgid "Open agenda" -msgstr "Abrir agenda" - -#: templates/core/meeting_detail.html:67 -msgid "Previous agenda item" -msgstr "Punto anterior de la agenda" - -#: templates/core/meeting_detail.html:68 -msgid "Next agenda item" -msgstr "Punto siguiente de la agenda" - -#: templates/core/meeting_detail.html:69 -msgid "Previous speaker" -msgstr "Anterior ponente" - -#: templates/core/meeting_detail.html:70 -msgid "Next speaker" -msgstr "Siguiente ponente" - -#: templates/core/meeting_detail.html:71 -#, fuzzy -msgid "Add speaker" -msgstr "Siguiente ponente" - -#: templates/core/meeting_detail.html:79 -msgid "Want to talk" -msgstr "Pide la palabra" - -#: templates/core/meeting_detail.html:80 -msgid "Direct response" -msgstr "Respuesta directa" - -#: templates/core/meeting_detail.html:82 -msgid "Clarify" -msgstr "Aclarar" - -#: templates/core/meeting_detail.html:83 -msgid "Point of order" -msgstr "Punto del orden del día" - -#: templates/core/meeting_detail.html:89 -msgid "Who?" -msgstr "" - -#: templates/core/meeting_detail.html:100 -msgid "Agenda item title" -msgstr "Título del punto" - -#: templates/core/meeting_detail.html:102 -msgid "Cancel" -msgstr "Cancelar" - -#: templates/core/meeting_detail.html:120 -msgid "Start meeting early?" -msgstr "¿Comenzar la reunión antes de hora?" - -#: templates/core/meeting_detail.html:123 -msgid "The meeting is scheduled to start at " -msgstr "La reunión está programada a las " - -#: templates/core/meeting_detail.html:124 -msgid "Are you sure you want to start this meeting ahead of schedule?" -msgstr "¿Estás seguro de querer empezar la reunión antes de hora?" - -#: templates/core/meeting_detail.html:127 -msgid "No, don't start the meeting!" -msgstr "¡No, no empezar aún!" - -#: templates/core/meeting_detail.html:128 -msgid "Yes, start the meeting." -msgstr "Sí, empecemos ya." - -#: templates/core/polity_detail.html:8 -msgid "Leave polity" -msgstr "Abandonar esta entidad" - -#: templates/core/polity_detail.html:11 -msgid "Join polity" -msgstr "Unirme a esta entidad" - -#: templates/core/polity_detail.html:13 -msgid "Request to join polity" -msgstr "Solicitar membresía" - -#: templates/core/polity_detail.html:20 -#, fuzzy -msgid "You are an officer in this polity." -msgstr "¡Todavía no hay ningún tema en esta entidad!" - -#: templates/core/polity_detail.html:22 -#, fuzzy -msgid "You are a member of this polity." -msgstr "Miembros de esta entidad" - -#: templates/core/polity_detail.html:31 -#, fuzzy -msgid "This polity is delegated." -msgstr "Esta entidad no ha llegado aún a ningún acuerdo." - -#: templates/core/polity_detail.html:37 -msgid "Your request to join has been sent." -msgstr "Se ha enviado tu petición para unirte." - -#: templates/core/polity_detail.html:39 -msgid "Your request to join this polity is still pending." -msgstr "Tu petición para unirte está pendiente de aprobación." - -#: templates/core/polity_detail.html:46 -msgid "members" -msgstr "miembros" - -#: templates/core/polity_detail.html:47 -msgid "topics" -msgstr "temas" - -#: templates/core/polity_detail.html:48 -#, fuzzy -msgid "agreements" -msgstr "Acuerdos" - -#: templates/core/polity_detail.html:49 -msgid "subpolities" -msgstr "subentidades" - -#: templates/core/polity_detail.html:54 templates/core/polity_detail.html:56 -msgid "membership requests" -msgstr "solicitudes de membresía" - -#: templates/core/polity_detail.html:61 -msgid "You have" +#: wasa2il/templates/core/election_detail.html:80 +msgid "Candidacy polities" msgstr "" -#: templates/core/polity_detail.html:61 -#, fuzzy -msgid "delegations" -msgstr "Declaraciones" - -#: templates/core/polity_detail.html:75 -msgid "Show only starred topics" -msgstr "Mostrar sólo temas favoritos" - -#: templates/core/polity_detail.html:76 -msgid "New topic" -msgstr "Nuevo tema" - -#: templates/core/polity_detail.html:81 templates/core/polity_detail.html:88 -#: templates/core/polity_list.html:16 -msgid "Topics" -msgstr "Temas" - -#: templates/core/polity_detail.html:81 -msgid "of discussion" -msgstr "de discusión" - -#: templates/core/polity_detail.html:83 -msgid "Topics are thematic categories that contain specific issues." -msgstr "Los temas son categorías temáticas que contienen asuntos específicos." - -#: templates/core/polity_detail.html:89 templates/core/topic_detail.html:28 -msgid "Issues" -msgstr "Asuntos" - -#: templates/core/polity_detail.html:90 -msgid "Open Issues" -msgstr "Asuntos abiertos" - -#: templates/core/polity_detail.html:91 -msgid "Voting Issues" -msgstr "Asuntos en votación" - -#: templates/core/polity_detail.html:104 -#, fuzzy -msgid "New issues" -msgstr "Nuevo asunto" - -#: templates/core/polity_detail.html:104 -#, fuzzy -msgid "in discussion" -msgstr "de discusión" - -#: templates/core/polity_detail.html:106 -#, fuzzy -msgid "These are the newest issues being discussed in this polity." -msgstr "¡Todavía no hay ningún tema en esta entidad!" - -#: templates/core/polity_detail.html:112 templates/core/polity_detail.html:158 -#: templates/core/topic_detail.html:29 -msgid "State" -msgstr "Estado" - -#: templates/core/polity_detail.html:114 templates/core/topic_detail.html:31 -msgid "Comments" -msgstr "Comentarios" - -#: templates/core/polity_detail.html:115 templates/core/polity_detail.html:160 -#: templates/core/topic_detail.html:32 -msgid "Votes" -msgstr "Votos" - -#: templates/core/polity_detail.html:123 templates/core/topic_detail.html:38 -msgid "You have voted on this issue" +#: wasa2il/templates/core/election_detail.html:81 +msgid "You can run" msgstr "" -#: templates/core/polity_detail.html:123 templates/core/topic_detail.html:38 -#, fuzzy -msgid "You have not voted on this issue" -msgstr "¡Todavía no hay ningún tema en esta entidad!" - -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -#, fuzzy -msgid "Voting" -msgstr "Asuntos en votación" - -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -msgid "Open" +#: wasa2il/templates/core/election_detail.html:85 +msgid "Voting polities" msgstr "" -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -#, fuzzy -msgid "Closed" -msgstr "Cerrar" +#: wasa2il/templates/core/election_detail.html:86 +msgid "You can vote" +msgstr "" -#: templates/core/polity_detail.html:141 -#, fuzzy -msgid "New election" -msgstr "Nueva reunión" +#: wasa2il/templates/core/election_detail.html:95 +msgid "Details ..." +msgstr "" -#: templates/core/polity_detail.html:145 -#, fuzzy -msgid "Closed elections" -msgstr "Declaraciones" +#: wasa2il/templates/core/election_detail.html:105 +#: wasa2il/templates/core/election_detail.html:154 +msgid "About This Election" +msgstr "" -#: templates/core/polity_detail.html:150 -#, fuzzy -msgid "Elections" -msgstr "Supuestos" +#: wasa2il/templates/core/election_detail.html:114 +msgid "Election results" +msgstr "" -#: templates/core/polity_detail.html:150 -msgid "putting people in power" +#: wasa2il/templates/core/election_detail.html:130 +msgid "No votes were cast." msgstr "" -#: templates/core/polity_detail.html:152 -msgid "" -"Sometimes you need to put people in their places. Elections do just that." +#: wasa2il/templates/core/election_detail.html:134 +msgid "Votes are still being counted." msgstr "" -#: templates/core/polity_detail.html:157 -#, fuzzy -msgid "Election" -msgstr "Supuestos" +#: wasa2il/templates/core/election_detail.html:148 +msgid "your favorites first!" +msgstr "" -#: templates/core/polity_detail.html:168 -#, fuzzy -msgid "You have voted in this election" -msgstr "¡Todavía no hay ningún tema en esta entidad!" +#: wasa2il/templates/core/election_detail.html:157 +msgid "How To Vote" +msgstr "" -#: templates/core/polity_detail.html:168 -#, fuzzy -msgid "You have not voted in this election" -msgstr "¡Todavía no hay ningún tema en esta entidad!" +#: wasa2il/templates/core/election_detail.html:159 +msgid "Click the Start Voting button to begin" +msgstr "" -#: templates/core/polity_detail.html:184 -msgid "New meeting" -msgstr "Nueva reunión" +#: wasa2il/templates/core/election_detail.html:160 +msgid "Click a Vote button to vote for a candidate" +msgstr "" -#: templates/core/polity_detail.html:187 templates/core/polity_detail.html:230 -msgid "Show ongoing meetings" -msgstr "Mostrar reuniones en curso" +#: wasa2il/templates/core/election_detail.html:161 +msgid "Click the arrows to move your favorite candidates to the top" +msgstr "" -#: templates/core/polity_detail.html:188 templates/core/polity_detail.html:231 -msgid "Show upcoming meetings" -msgstr "Mostrar próximas reuniones" +#: wasa2il/templates/core/election_detail.html:162 +msgid "Your vote will be counted when the deadline has passed" +msgstr "" -#: templates/core/polity_detail.html:189 templates/core/polity_detail.html:232 -msgid "Show finished meetings" -msgstr "Mostrar reuniones ya terminadas" +#: wasa2il/templates/core/election_detail.html:165 +msgid "Start Voting" +msgstr "" -#: templates/core/polity_detail.html:193 -msgid "Meetings" -msgstr "Reuniones" +#: wasa2il/templates/core/election_detail.html:172 +msgid "running in this election" +msgstr "" -#: templates/core/polity_detail.html:193 -msgid "physical or virtual" -msgstr "física o virtual" +#: wasa2il/templates/core/election_detail.html:177 +msgid "Announce candidacy" +msgstr "" -#: templates/core/polity_detail.html:195 -msgid "" -"A meeting is an event where people come together to discuss a set of agenda " -"items." +#: wasa2il/templates/core/election_detail.html:180 +msgid "Are you sure you want to withdraw? This can not be undone." msgstr "" -"Una reunión es un evento donde varias personas se reúnen para discutir un " -"conjunto de puntos de una agenda." -#: templates/core/polity_detail.html:199 -msgid "When" -msgstr "Cuándo" +#: wasa2il/templates/core/election_detail.html:182 +msgid "Withdraw candidacy" +msgstr "" -#: templates/core/polity_detail.html:200 -msgid "Where" -msgstr "Dónde" +#: wasa2il/templates/core/election_list.html:10 +msgid "Elections in polity" +msgstr "" -#: templates/core/polity_detail.html:201 -msgid "Organized by" -msgstr "Organizada por" +#: wasa2il/templates/core/issue_detail.html:24 +msgid "In topics" +msgstr "" -#: templates/core/polity_detail.html:202 -msgid "Status" -msgstr "Estado" +#: wasa2il/templates/core/issue_detail.html:27 +msgid "Start time" +msgstr "" -#: templates/core/polity_detail.html:227 -#, fuzzy -msgid "New delegation" -msgstr "Nueva reunión" +#: wasa2il/templates/core/issue_detail.html:29 +msgid "Deadline for discussion" +msgstr "" -#: templates/core/polity_detail.html:236 -#, fuzzy -msgid "Delegations" -msgstr "Declaraciones" +#: wasa2il/templates/core/issue_detail.html:32 +msgid "Deadline for proposals" +msgstr "" -#: templates/core/polity_detail.html:236 -msgid "votes entrusted to others" +#: wasa2il/templates/core/issue_detail.html:53 +msgid "Majority threshold" msgstr "" -#: templates/core/polity_detail.html:238 -msgid "You can set up delgations for the polity, for topics, or for issues." +#: wasa2il/templates/core/issue_detail.html:57 +#: wasa2il/templates/forum/discussion_detail.html:9 +msgid "Discussion" +msgstr "Discusión" + +#: wasa2il/templates/core/issue_detail.html:68 +#: wasa2il/templates/forum/discussion_detail.html:23 +msgid "Add comment" +msgstr "Añadir comentario" + +#: wasa2il/templates/core/issue_detail.html:77 +msgid "for or against this issue" msgstr "" -#: templates/core/polity_detail.html:239 -msgid "Here you can see all of your active delegations and where they lead to." +#: wasa2il/templates/core/issue_form.html:8 +msgid "version" msgstr "" -#: templates/core/polity_detail.html:249 -msgid "Subpolities" -msgstr "Subentidades" +#: wasa2il/templates/core/issue_form.html:22 +msgid "New issue" +msgstr "Nuevo asunto" -#: templates/core/polity_detail.html:251 -msgid "" -"A polity can have subordinate organizational units, such as how a " -"municipality relates to a country." -msgstr "" -"Una entidad puede tener unidades organizativas subordinadas, de la misma " -"forma que un municipio pertenece a un país." +#: wasa2il/templates/core/issues_new.html:10 +#: wasa2il/templates/core/polity_detail.html:22 +#: wasa2il/templates/core/polity_detail.html:40 +#, fuzzy +msgid "New issues" +msgstr "Nuevo asunto" -#: templates/core/polity_detail.html:265 -#: templates/forum/discussion_form.html:5 templates/forum/forum_form.html:5 +#: wasa2il/templates/core/issues_new.html:10 +#: wasa2il/templates/core/polity_detail.html:40 #, fuzzy -msgid "New forum" -msgstr "Nuevo documento" +msgid "in discussion" +msgstr "de discusión" -#: templates/core/polity_detail.html:268 +#: wasa2il/templates/core/issues_new.html:11 +#: wasa2il/templates/core/polity_detail.html:42 #, fuzzy -msgid "Discussion Forums" -msgstr "Discusión" +msgid "These are the newest issues being discussed in this polity." +msgstr "¡Todavía no hay ningún tema en esta entidad!" -#: templates/core/polity_detail.html:270 -msgid "" -"Often it is important to have open-ended discussions on a range of topics " -"outside of particular issues." +#: wasa2il/templates/core/issues_new.html:29 +#: wasa2il/templates/core/polity_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:30 +msgid "You have voted on this issue" msgstr "" -#: templates/core/polity_detail.html:274 templates/forum/forum_detail.html:18 -msgid "Name" +#: wasa2il/templates/core/issues_new.html:29 +#: wasa2il/templates/core/polity_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:30 +#, fuzzy +msgid "You have not voted on this issue" +msgstr "¡Todavía no hay ningún tema en esta entidad!" + +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +msgid "New" msgstr "" -#: templates/core/polity_detail.html:275 templates/forum/forum_detail.html:15 +#: wasa2il/templates/core/polity_detail.html:9 #, fuzzy -msgid "Discussions" -msgstr "Discusión" +msgid "You are an officer in this polity." +msgstr "¡Todavía no hay ningún tema en esta entidad!" -#: templates/core/polity_detail.html:276 -msgid "Unseen posts" -msgstr "" +#: wasa2il/templates/core/polity_detail.html:11 +#, fuzzy +msgid "You are a member of this polity." +msgstr "Miembros de esta entidad" -#: templates/core/polity_detail.html:299 templates/help/agreement.html:6 +#: wasa2il/templates/core/polity_detail.html:23 +#: wasa2il/templates/core/polity_detail.html:86 +#: wasa2il/templates/help/is/agreement.html:6 msgid "Agreements" msgstr "Acuerdos" -#: templates/core/polity_detail.html:299 +#: wasa2il/templates/core/polity_detail.html:36 +msgid "Show all new issues" +msgstr "" + +#: wasa2il/templates/core/polity_detail.html:68 +msgid "There are no new issues at the moment." +msgstr "" + +#: wasa2il/templates/core/polity_detail.html:86 msgid "of this polity" msgstr "de esta entidad" -#: templates/core/polity_detail.html:301 +#: wasa2il/templates/core/polity_detail.html:88 msgid "Here are all of the agreements this polity has arrived at." msgstr "Estos son todos los acuerdos a los que ha llegado esta entidad." -#: templates/core/polity_detail.html:315 -msgid "Members of this polity" -msgstr "Miembros de esta entidad" +#: wasa2il/templates/core/polity_detail.html:99 +#: wasa2il/templates/core/topic_form.html:6 +msgid "New topic" +msgstr "Nuevo tema" -#: templates/core/polity_detail.html:335 -msgid "Users requesting membership" -msgstr "Usuarios que han pedido membresía" +#: wasa2il/templates/core/polity_detail.html:103 +msgid "Show only starred topics" +msgstr "Mostrar sólo temas favoritos" + +#: wasa2il/templates/core/polity_detail.html:107 +msgid "of discussion" +msgstr "de discusión" -#: templates/core/polity_detail.html:371 -msgid "Leave this polity?" -msgstr "¿Quieres dejar esta entidad?" +#: wasa2il/templates/core/polity_detail.html:109 +msgid "Topics are thematic categories that contain specific issues." +msgstr "Los temas son categorías temáticas que contienen asuntos específicos." -#: templates/core/polity_detail.html:374 -msgid "Are you sure you want to stop being a member of this polity?" -msgstr "¿Estás seguro de querer dejar de ser miembro de esta entidad?" +#: wasa2il/templates/core/polity_detail.html:115 +#: wasa2il/templates/core/topic_detail.html:21 +msgid "Issues" +msgstr "Asuntos" -#: templates/core/polity_detail.html:376 -msgid "Only members get to participate in the polity's activities." -msgstr "Sólo los miembros pueden participar en las actividades de la entidad." +#: wasa2il/templates/core/polity_detail.html:116 +msgid "Open Issues" +msgstr "Asuntos abiertos" -#: templates/core/polity_detail.html:380 -msgid "No, I hit that button by accident" -msgstr "No, le he dado sin querer" +#: wasa2il/templates/core/polity_detail.html:117 +msgid "Voting Issues" +msgstr "Asuntos en votación" -#: templates/core/polity_detail.html:381 -msgid "Yes, I want to leave this polity." -msgstr "Sí, quiero dejar esta entidad." +#: wasa2il/templates/core/polity_detail.html:138 +msgid "Subpolities" +msgstr "Subentidades" -#: templates/core/polity_list.html:7 +#: wasa2il/templates/core/polity_form.html:6 +#: wasa2il/templates/core/polity_list.html:8 msgid "New polity" msgstr "Nueva entidad" -#: templates/core/polity_list.html:10 templates/help/polity.html:6 +#: wasa2il/templates/core/polity_list.html:12 +#: wasa2il/templates/help/is/polity.html:6 msgid "Polities" msgstr "Entidades" -#: templates/core/polity_list.html:15 -msgid "Members" -msgstr "Miembros" - -#: templates/core/topic_detail.html:15 +#: wasa2il/templates/core/topic_detail.html:12 msgid "This topic is delegated." msgstr "" -#: templates/core/topic_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:18 +msgid "List of issues" +msgstr "" + +#: wasa2il/templates/core/topic_detail.html:43 msgid "New discussions" msgstr "Nuevas discusiones" -#: templates/core/topic_detail.html:75 +#: wasa2il/templates/core/topic_detail.html:48 +msgid "in" +msgstr "en" + +#: wasa2il/templates/core/topic_detail.html:60 #, fuzzy msgid "Followers of this topic" msgstr "Miembros de esta entidad" -#: templates/forum/discussion_detail.html:7 +#: wasa2il/templates/core/stub/document_view.html:14 +#: wasa2il/templates/core/stub/document_view.html:85 +msgid "Comparison" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:15 +msgid "Comparison in progress..." +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:84 +msgid "Text" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:89 +msgid "Compared to" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +msgid "predecessor" +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:9 +msgid "This proposal has been accepted by vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:11 +msgid "" +"This content is still merely a proposal and has not yet been accepted by " +"vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:13 +msgid "This proposal has been rejected by vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:15 +msgid "This proposal is deprecated. A newer version has taken effect." +msgstr "" + +#: wasa2il/templates/forum/discussion_detail.html:7 #, fuzzy msgid "Back to forum" msgstr "Ir arriba" -#: templates/forum/discussion_detail.html:12 +#: wasa2il/templates/forum/discussion_detail.html:12 #, fuzzy msgid "This discussion is closed." msgstr "de discusión" -#: templates/forum/forum_detail.html:8 +#: wasa2il/templates/forum/discussion_form.html:5 +#: wasa2il/templates/forum/forum_form.html:5 +#, fuzzy +msgid "New forum" +msgstr "Nuevo documento" + +#: wasa2il/templates/forum/forum_detail.html:8 #, fuzzy msgid "New discussion" msgstr "Nuevas discusiones" -#: templates/forum/forum_detail.html:10 +#: wasa2il/templates/forum/forum_detail.html:10 msgid "Forum:" msgstr "" -#: templates/forum/forum_detail.html:19 +#: wasa2il/templates/forum/forum_detail.html:15 +#, fuzzy +msgid "Discussions" +msgstr "Discusión" + +#: wasa2il/templates/forum/forum_detail.html:19 msgid "Messages" msgstr "" -#: templates/forum/forum_detail.html:20 +#: wasa2il/templates/forum/forum_detail.html:20 msgid "Participants" msgstr "" -#: templates/forum/forum_detail.html:36 +#: wasa2il/templates/forum/forum_detail.html:36 #, fuzzy msgid "Followers of this forum" msgstr "Miembros de esta entidad" -#: templates/forum/forum_form.html:16 +#: wasa2il/templates/forum/forum_form.html:16 msgid "Name:" msgstr "" -#: templates/help/agreement.html:8 +#: wasa2il/templates/help/is/agreement.html:61 #, fuzzy msgid "" "\n" "

    \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

    \n" "

    \n" "There's a lot of \"generally\" in there, because different polities do " @@ -1345,73 +1213,74 @@ msgid "" "

    \n" "

    Conditions of adoption

    \n" "

    \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

    \n" -"

    More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

    More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

    \n" -"

    A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

    A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

    \n" "

    Document structure

    \n" "

    \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

    \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
    \n" "\t

    0047/2010

    \n" "\t

    Written declaration on the establishment of " "European Home-Made Ice Cream Day

    \n" "\t

    The European Parliament,

    \n" -"\t

    —   having regard to Rule 123 of " -"its Rules of Procedure,

    \n" +"\t

    —   having regard to Rule 123 " +"of its Rules of Procedure,

    \n" "\t
      \n" "\t\t
    1. whereas the quality of food is a distinctive feature of European " "products and home-made ice cream is synonymous \n" "\t\twith quality as far as fresh dairy products are concerned,
    2. \n" -"\t\t
    3. whereas in some areas home-made ice cream is a typical food product " -"in the fresh dairy \n" +"\t\t
    4. whereas in some areas home-made ice cream is a typical food " +"product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
    5. \n" -"\t\t
    6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
    7. \n" +"\t\t
    8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
    9. \n" "\t
    \n" "\t
      \n" -"\t\t
    1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\t\t
    2. Calls on the Member States to support the quality product that is" +" home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
    3. \n" -"\t\t
    4. Considers it important, to that end, to establish European Home-Made " -"Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\t\t
    5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
    6. \n" +"\t\t
    7. Considers it important, to that end, to establish European Home-" +"Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
    8. \n" +"\t\t
    9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
    10. \n" "\t
    \n" "
    \n" "

    \n" @@ -1420,10 +1289,10 @@ msgstr "" "

    \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

    \n" "

    \n" "There's a lot of \"generally\" in there, because different polities do " @@ -1431,110 +1300,112 @@ msgstr "" "

    \n" "

    Conditions of adoption

    \n" "

    \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

    \n" -"

    More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

    More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

    \n" -"

    A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

    A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

    \n" "

    Document structure

    \n" "

    \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

    \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
    \n" "\\t

    0047/2010

    \n" "\\t

    Written declaration on the establishment of " "European Home-Made Ice Cream Day

    \n" "\\t

    The European Parliament,

    \n" -"\\t

    —   having regard to Rule 123 of " -"its Rules of Procedure,

    \n" +"\\t

    —   having regard to Rule 123" +" of its Rules of Procedure,

    \n" "\\t
      \n" -"\\t\\t
    1. whereas the quality of food is a distinctive feature of European " -"products and home-made ice cream is synonymous \n" +"\\t\\t
    2. whereas the quality of food is a distinctive feature of " +"European products and home-made ice cream is synonymous \n" "\\t\\twith quality as far as fresh dairy products are concerned,
    3. \n" "\\t\\t
    4. whereas in some areas home-made ice cream is a typical food " "product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
    5. \n" -"\\t\\t
    6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
    7. \n" +"\\t\\t
    8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
    9. \n" "\\t
    \n" "\\t
      \n" -"\\t\\t
    1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\\t\\t
    2. Calls on the Member States to support the quality product that " +"is home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
    3. \n" -"\\t\\t
    4. Considers it important, to that end, to establish European Home-" -"Made Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\\t\\t
    5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
    6. \n" +"\\t\\t
    7. Considers it important, to that end, to establish European " +"Home-Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
    8. \n" +"\\t\\t
    9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
    10. \n" "\\t
    \n" "
    \n" "

    \n" -#: templates/help/agreement.html:64 +#: wasa2il/templates/help/is/agreement.html:64 msgid "The title" msgstr "El título" -#: templates/help/agreement.html:64 +#: wasa2il/templates/help/is/agreement.html:64 msgid "" -"Agreements may have various forms of reference. One is a reference number, " -"which should be unique and cannonical. Another is a human readable title " -"that is descriptive. Some polities might choose not to use either one, but " -"rules around this should generally be decided on." -msgstr "" -"Los acuerdos pueden tener diversas tipos de referencias. Una de ellas son " -"los números, que deben ser únicos y canónicos. Otro tipo son las referencias " -"descriptivas y legibles. Algunas entidades pueden optar por no adoptar " -"ninguno de esos tipos, pero por norma general conviene decidir cuál usar." - -#: templates/help/agreement.html:65 +"Agreements may have various forms of reference. One is a reference " +"number, which should be unique and cannonical. Another is a human " +"readable title that is descriptive. Some polities might choose not to use" +" either one, but rules around this should generally be decided on." +msgstr "" +"Los acuerdos pueden tener diversas tipos de referencias. Una de ellas son" +" los números, que deben ser únicos y canónicos. Otro tipo son las " +"referencias descriptivas y legibles. Algunas entidades pueden optar por " +"no adoptar ninguno de esos tipos, pero por norma general conviene decidir" +" cuál usar." + +#: wasa2il/templates/help/is/agreement.html:65 msgid "The polity" msgstr "La entidad" -#: templates/help/agreement.html:65 +#: wasa2il/templates/help/is/agreement.html:65 msgid "" -"Many polities make sure that their agreements contain their name, so as not " -"to be confusing." +"Many polities make sure that their agreements contain their name, so as " +"not to be confusing." msgstr "" -"Muchas entidades se aseguran de que sus acuerdos contengan su nombre para no " -"causar confusión." +"Muchas entidades se aseguran de que sus acuerdos contengan su nombre para" +" no causar confusión." -#: templates/help/agreement.html:66 +#: wasa2il/templates/help/is/agreement.html:66 msgid "References section" msgstr "Sección de referencias" -#: templates/help/agreement.html:66 +#: wasa2il/templates/help/is/agreement.html:66 msgid "" "In the references section, a polity may choose to include references to " "previous agreements, or articles in those agreements." @@ -1542,58 +1413,64 @@ msgstr "" "En la sección de referencias, una entidad puede incluir referencias a " "acuerdos anteriores o incluso a artículos de esos mismos acuerdos." -#: templates/help/agreement.html:67 +#: wasa2il/templates/help/is/agreement.html:67 msgid "Assumptions section" msgstr "Sección de supuestos" -#: templates/help/agreement.html:67 +#: wasa2il/templates/help/is/agreement.html:67 msgid "" -"The assumptions section generally contains a list of assumptions that are " -"being made. Often these are factual references, or slightly more oblique " -"references to previous decisions. Sometimes they're bizzarre statements of " -"opinion, or even, if used incorrectly, declarations of their own right." -msgstr "" -"La sección de supuestos normalmente contiene una lista de supuestos de los " -"que se parte. En ocasiones son referencias a hechos o a decisiones previas. " -"A veces son extrañas afirmaciones de opinión o incluso, si no se usan " -"correctamente, declaraciones que no se basan en ninguna referencia." - -#: templates/help/agreement.html:68 +"The assumptions section generally contains a list of assumptions that are" +" being made. Often these are factual references, or slightly more oblique" +" references to previous decisions. Sometimes they're bizzarre statements " +"of opinion, or even, if used incorrectly, declarations of their own " +"right." +msgstr "" +"La sección de supuestos normalmente contiene una lista de supuestos de " +"los que se parte. En ocasiones son referencias a hechos o a decisiones " +"previas. A veces son extrañas afirmaciones de opinión o incluso, si no se" +" usan correctamente, declaraciones que no se basan en ninguna referencia." + +#: wasa2il/templates/help/is/agreement.html:68 msgid "Declarations section" msgstr "Sección de declaraciones" -#: templates/help/agreement.html:68 +#: wasa2il/templates/help/is/agreement.html:68 msgid "" -"This is the meat of the agreement. It contains one or more statements which " -"are considered to be agreed upon by the polity when the document is adopted. " -"One might even call this the law." +"This is the meat of the agreement. It contains one or more statements " +"which are considered to be agreed upon by the polity when the document is" +" adopted. One might even call this the law." msgstr "" -"Esta es la parte central del acuerdo. Contiene una o más afirmaciones que se " -"han consensuado por los miembros de la entidad al adoptar el documento. Lo " -"podemos llamar incluso la ley." +"Esta es la parte central del acuerdo. Contiene una o más afirmaciones que" +" se han consensuado por los miembros de la entidad al adoptar el " +"documento. Lo podemos llamar incluso la ley." -#: templates/help/agreement.html:71 templates/help/polity.html:117 -#: templates/help/proposal.html:62 templates/help/wasa2il.html:28 +#: wasa2il/templates/help/is/agreement.html:71 +#: wasa2il/templates/help/is/polity.html:117 +#: wasa2il/templates/help/is/proposal.html:62 msgid "Related help pages" msgstr "Páginas de ayuda relacionadas" -#: templates/help/agreement.html:73 +#: wasa2il/templates/help/is/agreement.html:73 msgid "How does one make a proposal?" msgstr "¿Cómo hago una propuesta?" -#: templates/help/agreement.html:74 templates/help/index.html:13 -#: templates/help/polity.html:120 templates/help/proposal.html:65 -#: templates/help/wasa2il.html:30 +#: wasa2il/templates/help/is/agreement.html:74 +#: wasa2il/templates/help/is/index.html:13 +#: wasa2il/templates/help/is/polity.html:120 +#: wasa2il/templates/help/is/proposal.html:65 msgid "How does electronic democracy work?" msgstr "¿Cómo funciona la democracia electrónica?" -#: templates/help/authors.html:8 +#: wasa2il/templates/help/is/authors.html:50 msgid "" "\n" "

    Developers:

    \n" "
      \n" "
    • Smári McCarthy
    • \n" "
    • Tómas Árni Jónasson
    • \n" +"
    • Helgi Hrafn Gunnarsson
    • \n" +"
    • Björn Leví Gunnarsson
    • \n" +"
    • Bjarni Rúnar Einarsson
    • \n" "
    \n" "

    Contributors:

    \n" "
      \n" @@ -1602,6 +1479,10 @@ msgid "" "
    • Zineb Belmkaddem
    • \n" "
    • Þórgnýr Thoroddssen
    • \n" "
    • Stefán Vignir Skarphéðinsson
    • \n" +"
    • Jóhann Haukur Gunnarsson
    • \n" +"
    • Steinn Eldjárn Sigurðarson
    • \n" +"
    • Björgvin Ragnarsson
    • \n" +"
    • Viktor Smári
    • \n" "
    \n" "\n" "

    Translations:

    \n" @@ -1614,7 +1495,7 @@ msgid "" "\n" "

    Icelandic:

    \n" "
      \n" -"
    • Eva Þurríðardóttir
    • \n" +"
    • Eva Þuríðardóttir
    • \n" "
    • Smári McCarthy
    • \n" "
    • Tómas Árni Jónasson
    • \n" "
    \n" @@ -1626,63 +1507,68 @@ msgid "" "
\n" msgstr "" -#: templates/help/copyright.html:6 +#: wasa2il/templates/help/is/copyright.html:6 msgid "Copyright" msgstr "" -#: templates/help/copyright.html:8 +#: wasa2il/templates/help/is/copyright.html:10 msgid "" "\n" "This is free software, licensed under the GNU Affero General Public " "License.\n" msgstr "" -#: templates/help/index.html:8 +#: wasa2il/templates/help/is/index.html:8 msgid "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." msgstr "" "¡Hola! Bienvenido a la ayuda de Wasa2il. Aquí trataremos de ayudarte con " -"cualquier problema que te hayas encontrado al usar un sistema de democracia " -"directa." +"cualquier problema que te hayas encontrado al usar un sistema de " +"democracia directa." -#: templates/help/index.html:9 +#: wasa2il/templates/help/is/index.html:9 #, fuzzy msgid "" -"If you ever feel like you aren't getting a good enough explanation, please " -"\n" -"Polities are groups of people who come together to make decisions and enact " -"their will.\n" -"These are given various names depending on their form, structure, intent, " -"scale and scope.\n" +"Polities are groups of people who come together to make decisions and " +"enact their will.\n" +"These are given various names depending on their form, structure, intent," +" scale and scope.\n" "Therefore they are variously called \"countries\", \"towns\", \"clubs\", " "\"cabals\", \"mafias\", \"federations\",\n" "\"treaties\", \"unions\", \"associations\", \"companies\", \"phyles\", " @@ -1692,52 +1578,54 @@ msgid "" "

\n" "The reason we use the word \"polity\" in Wasa2il is that it is the most " "generic term we could\n" -"find. It says nothing of the form, the structure, the intent, scale or scope " -"of the group\n" +"find. It says nothing of the form, the structure, the intent, scale or " +"scope of the group\n" "of people, nor does it preclude anything. Using the word \"group\" could " "work too, but it lacks\n" "the imporant factor that there is an intent to make decisions and enact " "will.\n" "

\n" "

\n" -"In addition to consisting of a group of people, a polity will have a set of " -"laws\n" -"the group has decided to adhere to. In an abstract sense, membership in a " -"polity\n" -"grants a person certain rights and priviledges. For instance, membership in " -"a \n" -"school's student body may grant you the right to attend their annual prom,\n" +"In addition to consisting of a group of people, a polity will have a set " +"of laws\n" +"the group has decided to adhere to. In an abstract sense, membership in a" +" polity\n" +"grants a person certain rights and priviledges. For instance, membership " +"in a \n" +"school's student body may grant you the right to attend their annual " +"prom,\n" "and membership in a country (i.e. residency or citizenship) grants you a " "right \n" -"to live there and do certain things there, such as start companies. stand " -"in \n" +"to live there and do certain things there, such as start companies. stand" +" in \n" "elections, and so on.\n" "

\n" "

\n" -"Each polity has different rules - these are also called statutes, bylaws or " -"laws - \n" +"Each polity has different rules - these are also called statutes, bylaws " +"or laws - \n" "which affect the polity on two different levels.\n" "

\n" "

\n" "Firstly, there are meta-rules, which describe how rules are formed, how\n" -"decisions are made, how meetings happen, and how governance in general \n" +"decisions are made and how governance in general \n" "happens. Wasa2il has to be flexible enough to accomodate the varying \n" -"meta-rules of a given polity, otherwise the polity may decide that Wasa2il " -"isn't \n" -"useful to them. Sometimes these rules are referred to as \"rules of procedure" -"\" \n" -"or \"constitution\", depending on the type of polity which is using them.\n" +"meta-rules of a given polity, otherwise the polity may decide that " +"Wasa2il isn't \n" +"useful to them. Sometimes these rules are referred to as \"rules of " +"procedure\" \n" +"or \"constitution\", depending on the type of polity which is using them." +"\n" "

\n" "

\n" -"Secondly there are external rules, which are the decisions the polity makes " -"which\n" +"Secondly there are external rules, which are the decisions the polity " +"makes which\n" "don't affect its internal decisionmaking process.\n" "

\n" "

\n" -"It is hard to talk about a term completely in the abstract. We can describe " -"its features, but\n" -"that only gets us so far. So let's look at some of the things that can vary " -"from one polity\n" +"It is hard to talk about a term completely in the abstract. We can " +"describe its features, but\n" +"that only gets us so far. So let's look at some of the things that can " +"vary from one polity\n" "to another, and then take a few examples in each.\n" "

\n" "

Scope

\n" @@ -1749,57 +1637,57 @@ msgid "" "a common interest of its members.\n" "

\n" "

\n" -"La Casa Invisible is a social center in Málaga, Spain, which works in " -"the Málaga region\n" -"to promote ideas of social cohesion, autonomy, and democracy. It operates a " -"café, a book store,\n" -"a music hall, and various other projects, each of which could be considered " -"a sub-polity of\n" -"the social center itself. The scope of La Casa Invisible's actions is mostly " -"bound to decisions\n" +"La Casa Invisible is a social center in Málaga, Spain, which works" +" in the Málaga region\n" +"to promote ideas of social cohesion, autonomy, and democracy. It operates" +" a café, a book store,\n" +"a music hall, and various other projects, each of which could be " +"considered a sub-polity of\n" +"the social center itself. The scope of La Casa Invisible's actions is " +"mostly bound to decisions\n" "regarding the social center itself, and the activities that take place " "within it.\n" "

\n" "

\n" -"The Union of the Comoros (Udzima wa Komori) is an island nation to " -"the east of Africa, \n" -"just north of Madagascar. It has a population of 798.000 people living in an " -"area of 2.235km². \n" -"The scope of The Comoros as a polity is the land and national waters they " -"control, their airspace,\n" -"and their foreign trade, defense and other agreements they are party to. As " -"such, they have\n" -"municipal sub-polities, and are a member of the African Union, Francophonie, " -"Organization of Islamic\n" -"Cooperation, Arab League and Indian Ocean Commission superpolities, amongst " -"others.\n" +"The Union of the Comoros (Udzima wa Komori) is an island nation to" +" the east of Africa, \n" +"just north of Madagascar. It has a population of 798.000 people living in" +" an area of 2.235km². \n" +"The scope of The Comoros as a polity is the land and national waters they" +" control, their airspace,\n" +"and their foreign trade, defense and other agreements they are party to. " +"As such, they have\n" +"municipal sub-polities, and are a member of the African Union, " +"Francophonie, Organization of Islamic\n" +"Cooperation, Arab League and Indian Ocean Commission superpolities, " +"amongst others.\n" "

\n" "

Scale

\n" "

\n" "The scale of a polity determines how large it can be expected to become. " "Some polities are specifically\n" -"structured with intent to grow, while others intentionally try to stay at a " -"constant size.\n" +"structured with intent to grow, while others intentionally try to stay at" +" a constant size.\n" "

\n" "

\n" -"Muff Divers is a diving club in the village of Muff in Ireland. It " -"claims to be the fastest\n" +"Muff Divers is a diving club in the village of Muff in Ireland. It" +" claims to be the fastest\n" "growing diving club in the world, most likely owing to its name.\n" "

\n" "

Intent

\n" "

\n" "A polity is created around intent. Some polities intend to take over the " "world, others intend to make\n" -"the nicest cupcakes in all of the land. Some polities intend to send people " -"into space, and others\n" +"the nicest cupcakes in all of the land. Some polities intend to send " +"people into space, and others\n" "intend to track down and arrest criminals. Polities have all sorts of " "motives and intents.\n" "

\n" "

\n" "On the most basic level, a polity's intent is a description of what it " "intends to do. This has nothing\n" -"to do with whether the polity has the ability to do it, or whether anybody " -"or anything - such as another\n" +"to do with whether the polity has the ability to do it, or whether " +"anybody or anything - such as another\n" "polity, or the laws of physics - stand in their way.\n" "

\n" "

\n" @@ -1809,16 +1697,16 @@ msgid "" "

\n" "Representative democracy, direct democracy, participatory democracy, " "dictatorship. There are lots of terms\n" -"which describe the structure of a polity. In one sense, it refers to where " -"in the structure of relations\n" +"which describe the structure of a polity. In one sense, it refers to " +"where in the structure of relations\n" "between people the authority lies. In a dictatorship, one person has " "ultimate authority, although he may\n" -"choose to grant some authority downstream to trusted advisors, who in turn " -"have trusted advisors, and so\n" -"on. In a fully egealitarian system, each individual is equipotent, meaning " -"he has an equal ability to\n" -"everybody else to instigate decisions - however, it depends on the structure " -"what ability the individual\n" +"choose to grant some authority downstream to trusted advisors, who in " +"turn have trusted advisors, and so\n" +"on. In a fully egealitarian system, each individual is equipotent, " +"meaning he has an equal ability to\n" +"everybody else to instigate decisions - however, it depends on the " +"structure what ability the individual\n" "has to actually complete the decision making.\n" "

\n" "

\n" @@ -1832,37 +1720,37 @@ msgid "" "

\n" msgstr "" -#: templates/help/proposal.html:6 +#: wasa2il/templates/help/is/proposal.html:6 msgid "Proposals" msgstr "Propuestas" -#: templates/help/proposal.html:8 +#: wasa2il/templates/help/is/proposal.html:60 #, fuzzy msgid "" "\n" "

\n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

\n" "

\n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

\n" "

\n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -1870,14 +1758,14 @@ msgid "" "

\n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

\n" "

Proposing a new agreement

\n" "

\n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

\n" "

Proposing changes to a previous agreement

\n" "

\n" @@ -1891,10 +1779,10 @@ msgid "" "

\n" "

Making changes to a proposal

\n" "

\n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

    \n" "\t
  1. Remove a clause/statement from the document
  2. \n" "\t
  3. Move a clause/statement within the document
  4. \n" @@ -1905,8 +1793,9 @@ msgid "" "

    \n" "

    Voting on a proposal

    \n" "

    \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " @@ -1917,26 +1806,26 @@ msgstr "" "

    \n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

    \n" "

    \n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

    \n" "

    \n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -1944,14 +1833,14 @@ msgstr "" "

    \n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

    \n" "

    Proposing a new agreement

    \n" "

    \n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

    \n" "

    Proposing changes to a previous agreement

    \n" "

    \n" @@ -1965,10 +1854,10 @@ msgstr "" "

    \n" "

    Making changes to a proposal

    \n" "

    \n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

      \n" "\\t
    1. Remove a clause/statement from the document
    2. \n" "\\t
    3. Move a clause/statement within the document
    4. \n" @@ -1979,23 +1868,25 @@ msgstr "" "

      \n" "

      Voting on a proposal

      \n" "

      \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " "individually first.\n" "

      \n" -#: templates/help/wasa2il.html:8 +#: wasa2il/templates/help/is/wasa2il.html:26 msgid "" "\n" "

      \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

      \n" "

      \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2005,24 +1896,25 @@ msgid "" "goals and mutual understandings.\n" "

      \n" "

      \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

      \n" msgstr "" "\n" "

      \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

      \n" "

      \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2032,81 +1924,276 @@ msgstr "" "goals and mutual understandings.\n" "

      \n" "

      \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

      \n" -#: templates/registration/activate.html:5 +#: wasa2il/templates/registration/activate.html:5 msgid "Welcome to Wasa2il!" msgstr "¡Bienvenido a Wasa2il!" -#: templates/registration/activate.html:6 +#: wasa2il/templates/registration/activate.html:6 msgid "You are now successfully signed up. Sign in to start having fun!" +msgstr "¡Listo! Ya estás registrado. ¡Ahora ya puedes iniciar sesión y diviértete!" + +#: wasa2il/templates/registration/activation_complete.html:7 +msgid "Email verified!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:11 +msgid "Congratulations, your email has been verified!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:12 +msgid "You may now try to log in!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:13 +#: wasa2il/templates/registration/login.html:22 +msgid "Login" +msgstr "" + +#: wasa2il/templates/registration/activation_email.txt:2 +msgid "Please click the link below to verify your email address." +msgstr "" + +#: wasa2il/templates/registration/activation_email.txt:6 +#, python-format +msgid "This link will be active for %(expiration_days)s days." +msgstr "" + +#: wasa2il/templates/registration/activation_email_subject.txt:2 +#: wasa2il/templates/registration/registration_complete.html:7 +msgid "Email verification" +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:3 +msgid "" +"As of February 12th 2014, we require the verification of all user " +"accounts via the so-called Icekey." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:5 +msgid "" +"Please be advised that by registering and verifying your account, you " +"become a member of the Pirate Party of Iceland." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:7 +msgid "" +"Membership of political organizations is considered sensitive information" +" by law." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:8 +msgid "" +"Therefore, you should keep the following in mind when becoming a member " +"and using our system:" +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:10 +msgid "" +"Your username is publicly visible. If you don't want to be recognized, " +"use a different one than what you use elsewhere." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:11 +msgid "" +"Your profile settings are mostly public, including your " +"display name, image and description. We don't fill that out for you, " +"though." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:12 +msgid "Don't put anything in there that you don't want visible to the public." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:13 +msgid "We do not display your email address in public." msgstr "" -"¡Listo! Ya estás registrado. ¡Ahora ya puedes iniciar sesión y diviértete!" -#: templates/registration/login.html:6 +#: wasa2il/templates/registration/data_disclaimer.html:14 +msgid "If you have questions or concerns regarding privacy, please email us:" +msgstr "" + +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/registration_form.html:6 msgid "and partake in democracy..." msgstr "" -#: templates/registration/login.html:17 -#: templates/registration/password_reset_complete.html:5 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:5 -#: templates/registration/password_reset_form.html:5 +#: wasa2il/templates/registration/login.html:9 +msgid "" +"If you forgot your username, you can log in or reset your password with " +"your email address or SSN instead." +msgstr "" + +#: wasa2il/templates/registration/login.html:11 +msgid "If problems arise, please send an email to the following email address:" +msgstr "" + +#: wasa2il/templates/registration/login.html:24 +#: wasa2il/templates/registration/password_reset_complete.html:5 +#: wasa2il/templates/registration/password_reset_confirm.html:8 +#: wasa2il/templates/registration/password_reset_done.html:5 +#: wasa2il/templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "" -#: templates/registration/password_change_done.html:7 -msgid "Password changed" +#: wasa2il/templates/registration/logout.html:7 +msgid "Logged out" +msgstr "" + +#: wasa2il/templates/registration/logout.html:10 +msgid "We hope you'll be back soon. It'd be fun!" +msgstr "" + +#: wasa2il/templates/registration/password_change_done.html:11 +msgid "Success! Your password has been changed." +msgstr "" + +#: wasa2il/templates/registration/password_change_done.html:13 +msgid "Back to settings" msgstr "" -#: templates/registration/password_reset_complete.html:7 +#: wasa2il/templates/registration/password_reset_complete.html:7 msgid "Password reset successfully" msgstr "" -#: templates/registration/password_reset_confirm.html:18 +#: wasa2il/templates/registration/password_reset_confirm.html:22 +msgid "Error" +msgstr "" + +#: wasa2il/templates/registration/password_reset_confirm.html:23 msgid "Password reset failed" msgstr "" -#: templates/registration/password_reset_done.html:6 -msgid "Email with password reset instructions has been sent." +#: wasa2il/templates/registration/password_reset_done.html:5 +msgid "Check your email!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:7 +msgid "Email with password reset instructions may have been sent." +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:9 +#: wasa2il/templates/registration/password_reset_form.html:15 +msgid "Hints:" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:11 +msgid "Check your spam folder!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:12 +msgid "" +"If you do not receive an email, try resetting your password with other " +"email addresses you may have used." +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:13 +msgid "" +"For security and privacy reasons, we cannot tell you whether you used the" +" correct email address. Sorry!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:14 +msgid "Still nothing? Try creating a new account." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: wasa2il/templates/registration/password_reset_email.html:2 #, python-format -msgid "Reset password at %(site_name)s" +msgid "Someone (probably you) requested a password reset at %(site_name)s." +msgstr "" + +#: wasa2il/templates/registration/password_reset_email.html:4 +msgid "If you are unfamiliar with this request, you should ignore this message." +msgstr "" + +#: wasa2il/templates/registration/password_reset_email.html:6 +msgid "To reset your password, please click the following link:" +msgstr "" + +#: wasa2il/templates/registration/password_reset_form.html:5 +msgid "The tricky email question" msgstr "" -#: templates/registration/password_reset_form.html:9 +#: wasa2il/templates/registration/password_reset_form.html:11 msgid "Send password" msgstr "" -#, fuzzy -#~ msgid "Select topics" -#~ msgstr "Nuevo tema" +#: wasa2il/templates/registration/password_reset_form.html:17 +msgid "Not sure which email you used? Try them all!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_subject.txt:2 +msgid "Password reset requested" +msgstr "" + +#: wasa2il/templates/registration/registration_complete.html:11 +msgid "" +"Please check your email to find the verification message we have just " +"sent, and click the appropriate link." +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:6 +msgid "Verification error" +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:8 +msgid "" +"The following error occurred during the processing of your account's " +"verification:" +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:14 +msgid "Please try again and if the error persists, contact an administrator." +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:6 +msgid "Multiple accounts detected" +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:8 +msgid "" +"It appears that you already have a different account. Its username and " +"email address are provided below. Please try logging in again using its " +"credentials." +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:9 +msgid "If you have any further problems, please contact an administrator." +msgstr "" -#~ msgid "ID" -#~ msgstr "ID" +#: wasa2il/templates/registration/verification_duplicate.html:11 +msgid "Username" +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:12 +msgid "Email" +msgstr "" -#~ msgid "Back to document list" -#~ msgstr "Volver a la lista de documentos" +#: wasa2il/templates/registration/verification_needed.html:6 +msgid "Verification needed" +msgstr "" -#~ msgid "View this document" -#~ msgstr "Ver este documento" +#: wasa2il/templates/registration/verification_needed.html:8 +msgid "" +"The account registration process cannot be completed until verification " +"has been provided." +msgstr "" -#~ msgid "[Unnumbered proposal]" -#~ msgstr "[Propuesta sin número]" +#: wasa2il/templates/registration/verification_needed.html:9 +msgid "Please select one of the following options" +msgstr "" -#~ msgid "Propose alternative" -#~ msgstr "Proponer alternativa" +#: wasa2il/templates/registration/verification_needed.html:11 +msgid "Verify identity" +msgstr "" -#~ msgid "Add agenda item" -#~ msgstr "Añadir un punto a la agenda" diff --git a/wasa2il/locale/fr/LC_MESSAGES/django.po b/wasa2il/locale/fr/LC_MESSAGES/django.po index 0ab57ffe..3dc266fc 100644 --- a/wasa2il/locale/fr/LC_MESSAGES/django.po +++ b/wasa2il/locale/fr/LC_MESSAGES/django.po @@ -1,1342 +1,1210 @@ + msgid "" msgstr "" -"Project-Id-Version: wasa2il\n" +"Project-Id-Version: wasa2il\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-18 18:17+0000\n" +"POT-Creation-Date: 2016-08-10 10:13+0000\n" "PO-Revision-Date: 2013-01-24 19:50+0100\n" "Last-Translator: smari \n" +"Language: fr\n" "Language-Team: French\n" -"Language: fr_FR\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: crowdin.net\n" +"Generated-By: Babel 2.3.4\n" + +#: core/authentication.py:57 core/forms.py:46 +msgid "E-mail" +msgstr "" + +#: core/authentication.py:58 +msgid "Password" +msgstr "" + +#: core/base_classes.py:8 core/models.py:46 +#: wasa2il/templates/forum/forum_detail.html:18 +msgid "Name" +msgstr "" + +#: core/forms.py:46 +msgid "The email address you'd like to use for the site." +msgstr "" + +#: core/forms.py:63 +msgid "Filename must contain file extension" +msgstr "" + +#: core/models.py:32 +msgid "Description" +msgstr "" + +#: core/models.py:46 +msgid "The name to display on the site." +msgstr "" + +#: core/models.py:47 +msgid "E-mail visible" +msgstr "" + +#: core/models.py:47 +msgid "Whether to display your email address on your profile page." +msgstr "" + +#: core/models.py:48 +msgid "Bio" +msgstr "" + +#: core/models.py:49 +msgid "Picture" +msgstr "" + +#: core/models.py:53 +msgid "Language" +msgstr "" + +#: core/models.py:54 +msgid "Whether to show all topics in a polity, or only starred." +msgstr "" + +#: core/models.py:170 +msgid "Officers" +msgstr "" + +#: core/models.py:172 +msgid "Publicly listed?" +msgstr "" + +#: core/models.py:172 +msgid "Whether the polity is publicly listed or not." +msgstr "" + +#: core/models.py:173 +msgid "Publicly viewable?" +msgstr "" + +#: core/models.py:173 +msgid "Whether non-members can view the polity and its activities." +msgstr "" + +#: core/models.py:174 +msgid "Can only officers make new issues?" +msgstr "" + +#: core/models.py:174 +msgid "" +"If this is checked, only officers can create new issues. If it's " +"unchecked, any member can start a new issue." +msgstr "" -#: core/models.py:357 templates/core/polity_detail.html:111 +#: core/models.py:175 +msgid "Front polity?" +msgstr "" + +#: core/models.py:175 +msgid "" +"If checked, this polity will be displayed on the front page. The first " +"created polity automatically becomes the front polity." +msgstr "" + +#: core/models.py:303 +msgid "Accepted at assembly" +msgstr "" + +#: core/models.py:304 +msgid "Rejected at assembly" +msgstr "" + +#: core/models.py:313 wasa2il/templates/core/polity_detail.html:24 +#: wasa2il/templates/core/polity_detail.html:107 +#: wasa2il/templates/core/polity_detail.html:114 +#: wasa2il/templates/core/polity_list.html:17 +msgid "Topics" +msgstr "Sujets" + +#: core/models.py:319 +msgid "Ruleset" +msgstr "" + +#: core/models.py:321 wasa2il/templates/core/issue_detail.html:39 +msgid "Special process" +msgstr "" + +#: core/models.py:510 wasa2il/templates/core/issues_new.html:18 +#: wasa2il/templates/core/polity_detail.html:47 #, fuzzy msgid "Issue" msgstr "Issues" -#: core/models.py:361 +#: core/models.py:515 #, fuzzy msgid "Topic" msgstr "Sujets" -#: core/models.py:365 templates/core/polity_list.html:14 +#: core/models.py:520 wasa2il/templates/core/polity_list.html:16 msgid "Polity" msgstr "Polity" -#: templates/403.html:5 +#: core/models.py:659 +msgid "Proposed" +msgstr "" + +#: core/models.py:660 wasa2il/templates/core/issue_detail.html:49 +msgid "Accepted" +msgstr "" + +#: core/models.py:661 wasa2il/templates/core/issue_detail.html:49 +msgid "Rejected" +msgstr "" + +#: core/models.py:662 +msgid "Deprecated" +msgstr "" + +#: core/models.py:800 wasa2il/templates/core/election_detail.html:93 +msgid "Voting system" +msgstr "" + +#: core/models.py:801 wasa2il/templates/core/election_detail.html:74 +#: wasa2il/templates/core/election_list.html:19 +msgid "Deadline for candidacy" +msgstr "" + +#: core/models.py:802 +msgid "Start time for votes" +msgstr "" + +#: core/models.py:803 wasa2il/templates/core/election_detail.html:75 +#: wasa2il/templates/core/election_list.html:20 +#: wasa2il/templates/core/issue_detail.html:36 +msgid "Deadline for votes" +msgstr "" + +#: core/models.py:814 wasa2il/templates/core/election_detail.html:77 +msgid "Membership deadline" +msgstr "" + +#: core/models.py:817 wasa2il/templates/base.html:142 +msgid "Instructions" +msgstr "" + +#: core/views.py:423 +msgid "voting" +msgstr "" + +#: wasa2il/templates/403.html:5 msgid "403 Access Denied" msgstr "" -#: templates/404.html:5 +#: wasa2il/templates/404.html:5 msgid "404 File Not Found" msgstr "" -#: templates/base.html:7 -msgid "wassa2il" -msgstr "wassa2il" +#: wasa2il/templates/500.html:7 +msgid "Something bad happened!" +msgstr "" -#: templates/base.html:52 -msgid "‫وسائل" -msgstr "‫وسائل" +#: wasa2il/templates/500.html:9 +msgid "" +"A bunch of well-trained monkeys have been notified and they will take a " +"look at the problem as soon as possible." +msgstr "" -#: templates/base.html:65 templates/notLoginInHome.html:47 -#: templates/help/agreement.html:6 templates/help/authors.html:6 -#: templates/help/copyright.html:6 templates/help/index.html:6 -#: templates/help/polity.html:6 templates/help/proposal.html:6 -#: templates/help/wasa2il.html:6 +#: wasa2il/templates/500.html:11 +msgid "" +"Sometimes things break only for a few seconds, so it may work if you try " +"again." +msgstr "" + +#: wasa2il/templates/500.html:13 +msgid "Otherwise, please email us at" +msgstr "" + +#: wasa2il/templates/base.html:8 +msgid "Voting System - Pirate Party Iceland" +msgstr "" + +#: wasa2il/templates/base.html:91 wasa2il/templates/core/issue_detail.html:78 +msgid "There was an error while processing your vote. Please try again." +msgstr "" + +#: wasa2il/templates/base.html:94 +msgid "Your votes have been submitted!" +msgstr "" + +#: wasa2il/templates/base.html:95 +msgid "" +"You can continue adding, removing or reordering candidates until the " +"deadline." +msgstr "" + +#: wasa2il/templates/base.html:98 +#: wasa2il/templates/core/election_detail.html:175 +msgid "Working..." +msgstr "" + +#: wasa2il/templates/base.html:107 wasa2il/templates/help/is/agreement.html:6 +#: wasa2il/templates/help/is/authors.html:6 +#: wasa2il/templates/help/is/copyright.html:6 +#: wasa2il/templates/help/is/index.html:6 +#: wasa2il/templates/help/is/polity.html:6 +#: wasa2il/templates/help/is/proposal.html:6 +#: wasa2il/templates/help/is/wasa2il.html:6 msgid "Help" msgstr "Aide" -#: templates/base.html:69 +#: wasa2il/templates/base.html:113 msgid "My profile" msgstr "" -#: templates/base.html:70 +#: wasa2il/templates/base.html:114 #, fuzzy msgid "My settings" msgstr "Réunions" -#: templates/base.html:71 +#: wasa2il/templates/base.html:116 +#: wasa2il/templates/registration/verification_needed.html:12 msgid "Logout" msgstr "Logout" -#: templates/base.html:75 templates/hom01.html:18 -#: templates/registration/login.html:6 templates/registration/login.html:15 -#: templates/registration/password_reset_complete.html:9 +#: wasa2il/templates/base.html:120 wasa2il/templates/entry.html:17 +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/password_reset_complete.html:9 msgid "Log in" msgstr "Log in" -#: templates/base.html:76 templates/hom01.html:12 -#: templates/notLoginInHome.html:14 templates/registration/login.html:16 +#: wasa2il/templates/base.html:121 wasa2il/templates/entry.html:11 +#: wasa2il/templates/registration/login.html:23 +#: wasa2il/templates/registration/registration_form.html:6 +#: wasa2il/templates/registration/registration_form.html:26 msgid "Sign up" msgstr "Sign up" -#: templates/base.html:91 +#: wasa2il/templates/base.html:127 +msgid "Search agreements" +msgstr "" + +#: wasa2il/templates/base.html:139 msgid "Back to top" msgstr "Retour en haut" -#: templates/base.html:92 +#: wasa2il/templates/base.html:140 msgid "About wasa2il" msgstr "A propos de wasa2il" -#: templates/base.html:93 +#: wasa2il/templates/base.html:141 msgid "License" msgstr "License" -#: templates/base.html:94 templates/help/authors.html:6 +#: wasa2il/templates/base.html:143 wasa2il/templates/help/is/authors.html:6 msgid "Authors" msgstr "Auteurs" -#: templates/hom01.html:13 +#: wasa2il/templates/entry.html:12 msgid "In order to use Wasa2il you need to register an account." msgstr "In order to use Wasa2il you need to register an account." -#: templates/hom01.html:19 +#: wasa2il/templates/entry.html:18 msgid "If you log in, you can participate in your polities." msgstr "If you log in, you can participate in your polities." -#: templates/hom01.html:24 templates/notLoginInHome.html:33 +#: wasa2il/templates/entry.html:23 msgid "Browse Polities" msgstr "Browse Polities" -#: templates/hom01.html:25 +#: wasa2il/templates/entry.html:24 msgid "You can browse publicly visible polities without registering." msgstr "You can browse publicly visible polities without registering." -#: templates/hom01.html:35 -msgid "FAQ" -msgstr "FAQ" - -#: templates/hom01.html:37 templates/help/index.html:15 -msgid "What is a polity?" -msgstr "What is a polity?" - -#: templates/hom01.html:38 -msgid "How electronic democracy work?" -msgstr "How electronic democracy work?" - -#: templates/hom01.html:39 -msgid "Who can use Wasa2il?" -msgstr "Qui est ce qui peut utiliser Wasa2il ?" - -#: templates/hom01.html:40 -msgid "What does Wasa2il mean?" -msgstr "Que signifie Wasa2il ?" - -#: templates/hom01.html:44 -msgid "New polities" -msgstr "New polities" - -#: templates/hom01.html:52 -msgid "Recent decisions" -msgstr "Decisions récentes" - -#: templates/home.html:8 -#, fuzzy -msgid "Your polities" -msgstr "Your Polities" - -#: templates/home.html:14 -#, fuzzy -msgid "Browse other polities" -msgstr "Browse Polities" - -#: templates/home.html:19 -#, fuzzy -msgid "Take Action!" -msgstr "Assumptions" - -#: templates/home.html:21 -#, fuzzy -msgid "Browse polities" -msgstr "Browse Polities" - -#: templates/home.html:22 -msgid "Edit your profile" -msgstr "" - -#: templates/home.html:23 -#, fuzzy -msgid "Create a polity" -msgstr "Leave polity" - -#: templates/home.html:30 templates/core/issue_detail.html:66 -#, fuzzy -msgid "Your documents" -msgstr "Vos Documents" - -#: templates/home.html:33 templates/home.html.py:51 -#: templates/core/topic_detail.html:63 -msgid "in" -msgstr "in" - -#: templates/home.html:39 -msgid "Recently adopted law" -msgstr "" - -#: templates/home.html:39 templates/home.html.py:48 -#, fuzzy -msgid "in your polities" -msgstr "Your Polities" - -#: templates/home.html:48 -#, fuzzy -msgid "New proposals" -msgstr "Withdraw proposal" - -#: templates/notLoginInHome.html:23 -msgid "Start a Policy" -msgstr "Start a Policy" - -#: templates/notLoginInHome.html:49 -msgid "Join Code" -msgstr "Join Code" - -#: templates/notLoginInHome.html:51 -msgid "Free Software" -msgstr "Free Software" - -#: templates/profile.html:18 +#: wasa2il/templates/profile.html:19 msgid "Summary" msgstr "" -#: templates/profile.html:31 +#: wasa2il/templates/profile.html:39 msgid "This user hasn't provided a biography." msgstr "" -#: templates/profile.html:37 -msgid "This user has created:" +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +#: wasa2il/templates/profile.html:55 +msgid "Version" msgstr "" -#: templates/profile.html:40 -#, fuzzy -msgid "polities" -msgstr "Polities" - -#: templates/profile.html:41 -#, fuzzy -msgid "issues" -msgstr "Issues" - -#: templates/profile.html:42 -msgid "documents" -msgstr "documents" - -#: templates/profile.html:63 -msgid "is not viewable by non-members." -msgstr "" +#: wasa2il/templates/core/document_list.html:10 +#: wasa2il/templates/core/polity_list.html:18 wasa2il/templates/search.html:6 +msgid "Documents" +msgstr "Documents" -#: templates/settings.html:7 -#: templates/registration/password_change_done.html:5 -#: templates/registration/password_change_form.html:5 +#: wasa2il/templates/registration/password_change_done.html:7 +#: wasa2il/templates/registration/password_change_form.html:7 +#: wasa2il/templates/settings.html:8 #, fuzzy msgid "Change password" msgstr "Withdraw proposal" -#: templates/settings.html:8 +#: wasa2il/templates/settings.html:9 #, fuzzy msgid "Settings" msgstr "Réunions" -#: templates/settings.html:9 +#: wasa2il/templates/settings.html:10 msgid "You are signed in as" msgstr "" -#: templates/settings.html:16 -#: templates/registration/password_change_form.html:10 -#: templates/registration/password_reset_confirm.html:13 -msgid "Submit" -msgstr "" +#: wasa2il/templates/core/document_form.html:18 +#: wasa2il/templates/core/document_update.html:121 +#: wasa2il/templates/core/election_form.html:35 +#: wasa2il/templates/core/issue_form.html:30 +#: wasa2il/templates/core/polity_form.html:13 +#: wasa2il/templates/core/topic_form.html:14 +#: wasa2il/templates/forum/discussion_form.html:16 +#: wasa2il/templates/forum/forum_form.html:17 +#: wasa2il/templates/registration/password_change_form.html:21 +#: wasa2il/templates/registration/password_reset_confirm.html:13 +#: wasa2il/templates/settings.html:19 +msgid "Save" +msgstr "Enregistrer" -#: templates/core/_delegations_table.html:4 +#: wasa2il/templates/core/_delegations_table.html:4 msgid "Type" msgstr "Type" -#: templates/core/_delegations_table.html:5 +#: wasa2il/templates/core/_delegations_table.html:5 msgid "Item" msgstr "" -#: templates/core/_delegations_table.html:6 +#: wasa2il/templates/core/_delegations_table.html:6 msgid "To" msgstr "" -#: templates/core/_delegations_table.html:7 +#: wasa2il/templates/core/_delegations_table.html:7 +#: wasa2il/templates/core/issue_detail.html:49 msgid "Result" msgstr "" -#: templates/core/_delegations_table.html:8 -#: templates/core/_delegations_table.html:16 -#: templates/core/delegate_detail.html:29 +#: wasa2il/templates/core/_delegations_table.html:8 +#: wasa2il/templates/core/_delegations_table.html:16 +#: wasa2il/templates/core/delegate_detail.html:29 msgid "Details" msgstr "" -#: templates/core/_delegations_table.html:21 +#: wasa2il/templates/core/_delegations_table.html:21 #, fuzzy msgid "There are no delegations" msgstr "There are no documents here!" -#: templates/core/_delegations_table.html:22 +#: wasa2il/templates/core/_delegations_table.html:22 #, fuzzy msgid "What is a delegation?" msgstr "What is a topic?" -#: templates/core/_document_agreement_list_table.html:4 -#: templates/core/_document_list_table.html:4 -#: templates/core/_document_proposals_list_table.html:4 +#: wasa2il/templates/core/_document_agreement_list_table.html:4 +#: wasa2il/templates/core/_document_list_table.html:4 +#: wasa2il/templates/core/_document_proposals_list_table.html:4 msgid "Document" msgstr "Document" -#: templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/issue_detail.html:44 +#: wasa2il/templates/core/issue_detail.html:80 +msgid "Yes" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:6 +#: wasa2il/templates/core/issue_detail.html:45 +#: wasa2il/templates/core/issue_detail.html:82 +msgid "No" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:7 +#: wasa2il/templates/core/issue_detail.html:81 +msgid "Abstain" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:8 msgid "Adopted" msgstr "Adopted" -#: templates/core/_document_agreement_list_table.html:15 +#: wasa2il/templates/core/_document_agreement_list_table.html:27 msgid "This polity has no agreements." msgstr "This polity has no agreements." -#: templates/core/_document_agreement_list_table.html:16 -#: templates/help/polity.html:119 templates/help/proposal.html:64 +#: wasa2il/templates/core/_document_agreement_list_table.html:28 +#: wasa2il/templates/help/is/polity.html:119 +#: wasa2il/templates/help/is/proposal.html:64 msgid "What is an agreement?" msgstr "What is an agreement?" -#: templates/core/_document_list_table.html:5 +#: wasa2il/templates/core/_document_list_table.html:5 msgid "Adopted?" msgstr "Adopted?" -#: templates/core/_document_list_table.html:6 +#: wasa2il/templates/core/_document_list_table.html:6 msgid "Original author" msgstr "Auteur original" -#: templates/core/_document_list_table.html:7 +#: wasa2il/templates/core/_document_list_table.html:7 msgid "Contributors" msgstr "Contributors" -#: templates/core/_document_list_table.html:8 -#: templates/core/_document_proposals_list_table.html:5 +#: wasa2il/templates/core/_document_list_table.html:8 +#: wasa2il/templates/core/_document_proposals_list_table.html:5 msgid "Last edit" msgstr "Dernière modification" -#: templates/core/_document_list_table.html:21 -#: templates/core/_document_proposals_list_table.html:17 +#: wasa2il/templates/core/_document_list_table.html:21 +#: wasa2il/templates/core/_document_proposals_list_table.html:17 msgid "There are no documents here!" msgstr "There are no documents here!" -#: templates/core/_document_proposals_list_table.html:6 +#: wasa2il/templates/core/_document_modal.html:6 +#, python-format +msgid "New %(type_name)s" +msgstr "" + +#: wasa2il/templates/core/_document_modal.html:11 +msgid "Choose a document to reference" +msgstr "" + +#: wasa2il/templates/core/_document_modal.html:22 +msgid "Write assumption:" +msgstr "Write assumption:" + +#: wasa2il/templates/core/_document_modal.html:41 +#, fuzzy +msgid "Statements:" +msgstr "Save statement" + +#: wasa2il/templates/core/_document_modal.html:49 +#: wasa2il/templates/core/polity_detail.html:148 +#: wasa2il/templates/core/topic_detail.html:72 +#: wasa2il/templates/forum/forum_detail.html:48 +msgid "Close" +msgstr "Fermer" + +#: wasa2il/templates/core/_document_modal.html:50 +#, python-format +msgid "Save %(type_name)s" +msgstr "" + +#: wasa2il/templates/core/_document_proposals_list_table.html:6 #, fuzzy msgid "Actions" msgstr "Assumptions" -#: templates/core/_document_proposals_list_table.html:12 +#: wasa2il/templates/core/_document_proposals_list_table.html:12 #, fuzzy msgid "Propose" msgstr "Proposed?" -#: templates/core/_documentsMenu.html:5 +#: wasa2il/templates/core/_documentsMenu.html:5 msgid "Your Documents" msgstr "Vos Documents" -#: templates/core/_documentsMenu.html:19 +#: wasa2il/templates/core/_documentsMenu.html:19 msgid "Proposed Documents" msgstr "Proposed Documents" -#: templates/core/_documentsMenu.html:33 +#: wasa2il/templates/core/_documentsMenu.html:33 msgid "Adopted documents" msgstr "Adopted documents" -#: templates/core/_election_candidate_list.html:12 -msgid "Drag candidates here." +#: wasa2il/templates/core/_election_candidate_list.html:23 +#: wasa2il/templates/core/issue_detail.html:77 +#, fuzzy +msgid "Vote" +msgstr "Votes" + +#: wasa2il/templates/core/_election_candidate_list.html:34 +msgid "Your ballot is empty." +msgstr "" + +#: wasa2il/templates/core/_election_candidate_list.html:35 +msgid "Drag candidates here or click the vote buttons." +msgstr "" + +#: wasa2il/templates/core/_election_candidate_list.html:38 +msgid "You have selected all the candidates, good work!" msgstr "" -#: templates/core/_election_candidate_list.html:14 +#: wasa2il/templates/core/_election_candidate_list.html:40 #, fuzzy msgid "There are no candidates standing in this election yet!" msgstr "There are no topics in this polity!" -#: templates/core/_politiesMenu.html:4 -msgid "Your Polities" -msgstr "Your Polities" +#: wasa2il/templates/core/_election_list_table.html:8 +#, fuzzy +msgid "You have voted in this election" +msgstr "There are no topics in this polity!" -#: templates/core/_politiesMenu.html:18 -msgid "Other Polities" -msgstr "Other Polities" +#: wasa2il/templates/core/_election_list_table.html:8 +#, fuzzy +msgid "You have not voted in this election" +msgstr "There are no topics in this polity!" -#: templates/core/_topic_list_table.html:17 +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +#: wasa2il/templates/core/topic_detail.html:34 +#, fuzzy +msgid "Voting" +msgstr "Voting Issues" + +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +#: wasa2il/templates/core/topic_detail.html:34 +msgid "Open" +msgstr "" + +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/topic_detail.html:34 +#, fuzzy +msgid "Closed" +msgstr "Fermer" + +#: wasa2il/templates/core/_election_list_table.html:18 +msgid "No elections are scheduled at the moment." +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:8 +#: wasa2il/templates/core/election_form.html:28 +#, fuzzy +msgid "New election" +msgstr "Nouvelle réunion" + +#: wasa2il/templates/core/_polity_detail_elections.html:13 +msgid "Show closed elections" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:14 +msgid "Show all elections" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +#: wasa2il/templates/core/polity_detail.html:25 +#, fuzzy +msgid "Elections" +msgstr "Assumptions" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +msgid "putting people in power" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:20 +msgid "Sometimes you need to put people in their places. Elections do just that." +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:25 +#: wasa2il/templates/core/election_list.html:15 +#, fuzzy +msgid "Election" +msgstr "Assumptions" + +#: wasa2il/templates/core/_polity_detail_elections.html:26 +#: wasa2il/templates/core/election_list.html:16 +#: wasa2il/templates/core/issues_new.html:19 +#: wasa2il/templates/core/polity_detail.html:48 +#: wasa2il/templates/core/topic_detail.html:22 +msgid "State" +msgstr "State" + +#: wasa2il/templates/core/_polity_detail_elections.html:27 +#: wasa2il/templates/core/election_detail.html:91 +#: wasa2il/templates/core/election_detail.html:172 +#: wasa2il/templates/core/election_list.html:17 +msgid "Candidates" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:28 +#: wasa2il/templates/core/election_detail.html:89 +#: wasa2il/templates/core/election_detail.html:148 +#: wasa2il/templates/core/election_list.html:18 +#: wasa2il/templates/core/issue_detail.html:42 +#: wasa2il/templates/core/issues_new.html:21 +#: wasa2il/templates/core/polity_detail.html:50 +#: wasa2il/templates/core/topic_detail.html:24 +msgid "Votes" +msgstr "Votes" + +#: wasa2il/templates/core/_topic_list_table.html:19 msgid "There are no topics in this polity!" msgstr "There are no topics in this polity!" -#: templates/core/delegate_detail.html:6 -#: templates/core/document_detail.html:14 -#: templates/core/election_detail.html:6 templates/core/issue_detail.html:6 -#: templates/core/meeting_detail.html:16 templates/core/topic_detail.html:7 -#: templates/forum/discussion_detail.html:6 -#: templates/forum/forum_detail.html:7 +#: wasa2il/templates/core/_topic_list_table.html:20 +msgid "Start a new topic" +msgstr "" + +#: wasa2il/templates/core/delegate_detail.html:6 +#: wasa2il/templates/core/document_detail.html:14 +#: wasa2il/templates/core/election_detail.html:31 +#: wasa2il/templates/core/election_list.html:8 +#: wasa2il/templates/core/issue_detail.html:6 +#: wasa2il/templates/core/issues_new.html:8 +#: wasa2il/templates/core/topic_detail.html:7 +#: wasa2il/templates/forum/discussion_detail.html:6 +#: wasa2il/templates/forum/forum_detail.html:7 msgid "Back to polity" msgstr "Back to polity" -#: templates/core/delegate_detail.html:8 +#: wasa2il/templates/core/delegate_detail.html:8 #, fuzzy msgid "Delegation:" msgstr "Declarations" -#: templates/core/delegate_detail.html:8 +#: wasa2il/templates/core/delegate_detail.html:8 msgid "to" msgstr "" -#: templates/core/delegate_detail.html:13 +#: wasa2il/templates/core/delegate_detail.html:13 #, fuzzy msgid "Stop delegating" msgstr "Start meeting" -#: templates/core/delegate_detail.html:14 +#: wasa2il/templates/core/delegate_detail.html:14 msgid "Change delegation" msgstr "" -#: templates/core/delegate_detail.html:33 +#: wasa2il/templates/core/delegate_detail.html:33 msgid "Delegation type" msgstr "" -#: templates/core/delegate_detail.html:37 +#: wasa2il/templates/core/delegate_detail.html:37 #, fuzzy msgid "Delegated item" msgstr "Next agenda item" -#: templates/core/delegate_detail.html:41 +#: wasa2il/templates/core/delegate_detail.html:41 #, fuzzy msgid "Delegated to user" msgstr "Related to issue:" -#: templates/core/delegate_detail.html:45 +#: wasa2il/templates/core/delegate_detail.html:45 msgid "Resulting delegation" msgstr "" -#: templates/core/delegate_detail.html:54 +#: wasa2il/templates/core/delegate_detail.html:54 msgid "Pathway breakdown" msgstr "" -#: templates/core/document_detail.html:8 templates/core/document_update.html:8 +#: wasa2il/templates/core/document_detail.html:8 msgid "Withdraw proposal" msgstr "Withdraw proposal" -#: templates/core/document_detail.html:10 -#: templates/core/document_update.html:10 +#: wasa2il/templates/core/document_detail.html:10 msgid "Propose this document" msgstr "Propose this document" -#: templates/core/document_detail.html:13 +#: wasa2il/templates/core/document_detail.html:13 msgid "Edit this document" msgstr "Edit this document" -#: templates/core/document_detail.html:22 +#: wasa2il/templates/core/document_detail.html:22 msgid "Assumptions" msgstr "Assumptions" -#: templates/core/document_detail.html:36 +#: wasa2il/templates/core/document_detail.html:36 msgid "Declarations" msgstr "Declarations" -#: templates/core/document_form.html:4 +#: wasa2il/templates/core/document_form.html:6 msgid "New Document" msgstr "Nouveau Document" -#: templates/core/document_form.html:6 +#: wasa2il/templates/core/document_form.html:9 msgid "In polity:" msgstr "In polity:" -#: templates/core/document_form.html:9 -msgid "Related to issues:" -msgstr "Related to issues:" - -#: templates/core/document_form.html:9 -msgid "Related to issue:" -msgstr "Related to issue:" - -#: templates/core/document_form.html:22 templates/core/issue_form.html:12 -#: templates/forum/discussion_form.html:16 templates/forum/forum_form.html:17 -msgid "Save" -msgstr "Enregistrer" - -#: templates/core/document_list.html:7 templates/core/issue_detail.html:53 -#: templates/core/polity_detail.html:294 +#: wasa2il/templates/core/document_list.html:7 +#: wasa2il/templates/core/polity_detail.html:83 msgid "New document" msgstr "Nouveau document" -#: templates/core/document_list.html:10 templates/core/issue_detail.html:56 -#: templates/core/polity_detail.html:113 templates/core/polity_list.html:17 -#: templates/core/topic_detail.html:30 -msgid "Documents" -msgstr "Documents" +#: wasa2il/templates/core/document_update.html:15 +msgid "Change proposal must differ from its predecessor." +msgstr "" -#: templates/core/document_update.html:15 +#: wasa2il/templates/core/document_update.html:88 msgid "Agreement" msgstr "Agreement" -#: templates/core/document_update.html:16 +#: wasa2il/templates/core/document_update.html:90 +#: wasa2il/templates/core/issue_detail.html:22 msgid "Proposal" msgstr "Proposal" -#: templates/core/document_update.html:17 -msgid "Draft proposal:" -msgstr "Draft proposal:" - -#: templates/core/document_update.html:48 -msgid "Referenced by issues" -msgstr "Referenced by issues" - -#: templates/core/document_update.html:56 -msgid "Contributors to this document" -msgstr "Contributors to this document" - -#: templates/core/document_update.html:65 -#: templates/core/meeting_detail.html:36 -#: templates/core/meeting_detail.html:101 -msgid "Add" -msgstr "Ajouter" - -#: templates/core/document_update.html:73 -#: templates/core/document_update.html:132 -msgid "New reference" -msgstr "Nouvelle référence" - -#: templates/core/document_update.html:74 -#: templates/core/document_update.html:154 -msgid "New assumption" -msgstr "New assumption" - -#: templates/core/document_update.html:75 -#: templates/core/document_update.html:172 -msgid "New statement" -msgstr "New statement" - -#: templates/core/document_update.html:76 -#: templates/core/document_update.html:189 -msgid "New subheading" -msgstr "New subheading" +#: wasa2il/templates/core/document_update.html:115 +#: wasa2il/templates/core/document_update.html:192 +#: wasa2il/templates/core/issues_new.html:20 +#: wasa2il/templates/core/polity_detail.html:49 +#: wasa2il/templates/core/topic_detail.html:23 +msgid "Comments" +msgstr "Comments" -#: templates/core/document_update.html:77 -msgid "Import structure" +#: wasa2il/templates/core/document_update.html:115 +msgid "optional" msgstr "" -#: templates/core/document_update.html:82 -#: templates/core/document_update.html:89 -msgid "Please note:" +#: wasa2il/templates/core/document_update.html:120 +msgid "Preview" msgstr "" -#: templates/core/document_update.html:83 -msgid "This document has been proposed." +#: wasa2il/templates/core/document_update.html:123 +msgid "Preview is required before saving" msgstr "" -#: templates/core/document_update.html:84 -msgid "" -"Changes you make to it now will become change proposals, which will be voted " -"on individually." -msgstr "" +#: wasa2il/templates/core/document_update.html:127 +#: wasa2il/templates/core/document_update.html:129 +#: wasa2il/templates/registration/password_change_form.html:20 +msgid "Cancel" +msgstr "Annuler" -#: templates/core/document_update.html:90 -msgid "This document has been adopted." +#: wasa2il/templates/core/document_update.html:136 +msgid "Propose change" msgstr "" -#: templates/core/document_update.html:91 -msgid "" -"In order to make change proposals to it, you must import it into a new open " -"issue." +#: wasa2il/templates/core/document_update.html:141 +#: wasa2il/templates/core/document_update.html:143 +msgid "Edit proposal" msgstr "" -#: templates/core/document_update.html:100 -#, fuzzy -msgid "Change proposals" -msgstr "Withdraw proposal" - -#: templates/core/document_update.html:105 -#, fuzzy -msgid "Deleted" -msgstr "Supprimer" - -#: templates/core/document_update.html:108 -msgid "Moved" +#: wasa2il/templates/core/document_update.html:149 +#: wasa2il/templates/core/document_update.html:151 +msgid "Put to vote" msgstr "" -#: templates/core/document_update.html:115 -msgid "Added at beginning" +#: wasa2il/templates/core/document_update.html:170 +msgid "Referenced issue" msgstr "" -#: templates/core/document_update.html:117 -msgid "Added after:" +#: wasa2il/templates/core/document_update.html:186 +msgid "Versions" msgstr "" -#: templates/core/document_update.html:135 -msgid "Choose a document to reference:" -msgstr "Choose a document to reference:" - -#: templates/core/document_update.html:145 -#: templates/core/document_update.html:163 -#: templates/core/document_update.html:180 -#: templates/core/document_update.html:197 -#: templates/core/document_update.html:215 -#: templates/core/issue_detail.html:117 templates/core/polity_detail.html:327 -#: templates/core/polity_detail.html:363 templates/core/topic_detail.html:87 -#: templates/forum/forum_detail.html:48 -msgid "Close" -msgstr "Fermer" - -#: templates/core/document_update.html:146 -msgid "Save reference" -msgstr "Save reference" - -#: templates/core/document_update.html:157 -msgid "Write assumption:" -msgstr "Write assumption:" - -#: templates/core/document_update.html:164 -msgid "Save assumption" -msgstr "Save assumption" - -#: templates/core/document_update.html:181 -msgid "Save statement" -msgstr "Save statement" - -#: templates/core/document_update.html:198 -msgid "Save subheading" -msgstr "Save subheading" - -#: templates/core/document_update.html:206 -#, fuzzy -msgid "Import statements" -msgstr "New statement" - -#: templates/core/document_update.html:209 -#, fuzzy -msgid "Statements:" -msgstr "Save statement" - -#: templates/core/document_update.html:216 -#, fuzzy -msgid "Import" -msgstr "Support" - -#: templates/core/document_update.html:228 -#, fuzzy -msgid "Add reference" -msgstr "Nouvelle référence" - -#: templates/core/document_update.html:229 -#, fuzzy -msgid "Add assumption" -msgstr "Assumptions" - -#: templates/core/document_update.html:231 -#, fuzzy -msgid "Add statement" -msgstr "New statement" +#: wasa2il/templates/core/document_update.html:190 +msgid "Status" +msgstr "Status" -#: templates/core/document_update.html:232 -#, fuzzy -msgid "Add subheading" -msgstr "New subheading" +#: wasa2il/templates/core/document_update.html:191 +msgid "Author" +msgstr "" -#: templates/core/document_update.html:238 -msgid "Delete" -msgstr "Supprimer" +#: wasa2il/templates/core/document_update.html:210 +msgid "New draft" +msgstr "" -#: templates/core/election_detail.html:8 +#: wasa2il/templates/core/election_detail.html:33 #, fuzzy msgid "Election:" msgstr "Declarations" -#: templates/core/election_detail.html:11 +#: wasa2il/templates/core/election_detail.html:36 #, fuzzy msgid "This election is closed." msgstr "This meeting is ongoing." -#: templates/core/election_detail.html:15 -#, fuzzy -msgid "This election is delegated." -msgstr "This polity has no agreements." - -#: templates/core/election_detail.html:15 templates/core/issue_detail.html:15 -#: templates/core/polity_detail.html:31 templates/core/topic_detail.html:15 -msgid "View details." +#: wasa2il/templates/core/election_detail.html:39 +msgid "You cannot vote in this election:" msgstr "" -#: templates/core/election_detail.html:23 -#, fuzzy -msgid "Deadline for candidacy:" -msgstr "Draft proposal:" - -#: templates/core/election_detail.html:24 templates/core/issue_detail.html:26 -msgid "Deadline for votes:" -msgstr "" - -#: templates/core/election_detail.html:25 templates/core/issue_detail.html:29 -#, fuzzy -msgid "Votes:" -msgstr "Votes" - -#: templates/core/election_detail.html:26 -msgid "Candidates:" +#: wasa2il/templates/core/election_detail.html:41 +#: wasa2il/templates/core/election_detail.html:54 +msgid "Please log in." msgstr "" -#: templates/core/election_detail.html:27 -#, fuzzy -msgid "Voting system:" -msgstr "Voting Issues" - -#: templates/core/election_detail.html:39 -#: templates/core/polity_detail.html:159 -msgid "Candidates" +#: wasa2il/templates/core/election_detail.html:43 +msgid "You joined the organization too late." msgstr "" -#: templates/core/election_detail.html:39 -msgid "running in this election" +#: wasa2il/templates/core/election_detail.html:45 +#: wasa2il/templates/core/election_detail.html:56 +msgid "You are not a member of this polity." msgstr "" -#: templates/core/election_detail.html:50 templates/core/issue_detail.html:38 -#, fuzzy -msgid "Vote" -msgstr "Votes" - -#: templates/core/election_detail.html:50 -msgid "for the candidates standing in this election" +#: wasa2il/templates/core/election_detail.html:47 +#: wasa2il/templates/core/election_detail.html:58 +msgid "You do not meet the requirements." msgstr "" -#: templates/core/election_detail.html:51 templates/core/issue_detail.html:39 -msgid "There was an error while processing your vote. Please try again." +#: wasa2il/templates/core/election_detail.html:52 +msgid "You cannot run in this election:" msgstr "" -#: templates/core/issue_detail.html:11 -msgid "This issue is closed." -msgstr "" - -#: templates/core/issue_detail.html:15 -msgid "This issue is delegated." -msgstr "" - -#: templates/core/issue_detail.html:23 +#: wasa2il/templates/core/election_detail.html:65 #, fuzzy -msgid "In topics:" -msgstr "sujets" - -#: templates/core/issue_detail.html:25 -#, fuzzy -msgid "Deadline for proposals:" -msgstr "Draft proposal:" - -#: templates/core/issue_detail.html:30 -msgid "Yes:" -msgstr "" - -#: templates/core/issue_detail.html:31 -msgid "No:" -msgstr "" - -#: templates/core/issue_detail.html:38 -msgid "for or against the documents in this issue" -msgstr "" - -#: templates/core/issue_detail.html:41 -msgid "Yes" -msgstr "" - -#: templates/core/issue_detail.html:42 -msgid "Abstain" -msgstr "" - -#: templates/core/issue_detail.html:43 -msgid "No" -msgstr "" - -#: templates/core/issue_detail.html:45 -#, fuzzy -msgid "Voting closes in" -msgstr "Voting Issues" - -#: templates/core/issue_detail.html:52 templates/core/issue_detail.html:103 -#, fuzzy -msgid "Import agreement" -msgstr "Agreement" - -#: templates/core/issue_detail.html:56 -msgid "proposed or in progress" -msgstr "proposed or in progress" - -#: templates/core/issue_detail.html:57 -msgid "" -"Documents are structured texts which contain the laws of the polity, or " -"proposals for such laws." -msgstr "" -"Documents are structured texts which contain the laws of the polity, or " -"proposals for such laws." - -#: templates/core/issue_detail.html:58 -#, fuzzy -msgid "Proposed documents" -msgstr "Proposed Documents" - -#: templates/core/issue_detail.html:67 -msgid "Documents you are working on that haven't been proposed:" -msgstr "" - -#: templates/core/issue_detail.html:78 -#: templates/forum/discussion_detail.html:9 -msgid "Discussion" -msgstr "Discussion" - -#: templates/core/issue_detail.html:85 -#: templates/forum/discussion_detail.html:23 -msgid "Add comment" -msgstr "Ajouter un commentaire" - -#: templates/core/issue_detail.html:106 -#, fuzzy -msgid "Choose an agreement to import:" -msgstr "Choose a document to reference:" - -#: templates/core/issue_detail.html:114 -msgid "" -"The purpose of importing an agreement to an issue is to be able to propose " -"changes to it." -msgstr "" - -#: templates/core/issue_detail.html:118 -msgid "Import document to issue" -msgstr "" - -#: templates/core/issue_form.html:5 templates/core/polity_detail.html:72 -#: templates/core/topic_detail.html:9 -msgid "New issue" -msgstr "New issue" - -#: templates/core/meeting_detail.html:21 -msgid "Attendance list" -msgstr "Attendance list" - -#: templates/core/meeting_detail.html:23 -msgid "Attend meeting" -msgstr "Attend meeting" - -#: templates/core/meeting_detail.html:25 -msgid "You can sign in to attendance when the meeting has started." -msgstr "You can sign in to attendance when the meeting has started." - -#: templates/core/meeting_detail.html:29 -msgid "Meeting managers" -msgstr "Meeting managers" - -#: templates/core/meeting_detail.html:41 -msgid "This meeting will start in" -msgstr "This meeting will start in" - -#: templates/core/meeting_detail.html:42 -msgid "This meeting is ongoing." -msgstr "This meeting is ongoing." - -#: templates/core/meeting_detail.html:43 -msgid "This meeting ended at" -msgstr "Cette réunion s'est terminée à" - -#: templates/core/meeting_detail.html:51 -msgid "Ajourn meeting" -msgstr "Ajourn meeting" - -#: templates/core/meeting_detail.html:52 -msgid "Start meeting" -msgstr "Start meeting" - -#: templates/core/meeting_detail.html:57 -msgid "Close agenda" -msgstr "Close agenda" - -#: templates/core/meeting_detail.html:60 -msgid "Open agenda" -msgstr "Open agenda" - -#: templates/core/meeting_detail.html:67 -msgid "Previous agenda item" -msgstr "Previous agenda item" - -#: templates/core/meeting_detail.html:68 -msgid "Next agenda item" -msgstr "Next agenda item" - -#: templates/core/meeting_detail.html:69 -msgid "Previous speaker" -msgstr "Previous speaker" - -#: templates/core/meeting_detail.html:70 -msgid "Next speaker" -msgstr "Next speaker" - -#: templates/core/meeting_detail.html:71 -#, fuzzy -msgid "Add speaker" -msgstr "Next speaker" - -#: templates/core/meeting_detail.html:79 -msgid "Want to talk" -msgstr "Want to talk" - -#: templates/core/meeting_detail.html:80 -msgid "Direct response" -msgstr "Direct response" - -#: templates/core/meeting_detail.html:82 -msgid "Clarify" -msgstr "Clarifier" - -#: templates/core/meeting_detail.html:83 -msgid "Point of order" -msgstr "Point of order" - -#: templates/core/meeting_detail.html:89 -msgid "Who?" -msgstr "" - -#: templates/core/meeting_detail.html:100 -msgid "Agenda item title" -msgstr "Agenda item title" - -#: templates/core/meeting_detail.html:102 -msgid "Cancel" -msgstr "Annuler" - -#: templates/core/meeting_detail.html:120 -msgid "Start meeting early?" -msgstr "Start meeting early?" - -#: templates/core/meeting_detail.html:123 -msgid "The meeting is scheduled to start at " -msgstr "The meeting is scheduled to start at " - -#: templates/core/meeting_detail.html:124 -msgid "Are you sure you want to start this meeting ahead of schedule?" -msgstr "Are you sure you want to start this meeting ahead of schedule?" - -#: templates/core/meeting_detail.html:127 -msgid "No, don't start the meeting!" -msgstr "No, don't start the meeting!" - -#: templates/core/meeting_detail.html:128 -msgid "Yes, start the meeting." -msgstr "Oui, commencer la réunion." - -#: templates/core/polity_detail.html:8 -msgid "Leave polity" -msgstr "Leave polity" - -#: templates/core/polity_detail.html:11 -msgid "Join polity" -msgstr "Join polity" - -#: templates/core/polity_detail.html:13 -msgid "Request to join polity" -msgstr "Request to join polity" - -#: templates/core/polity_detail.html:20 -#, fuzzy -msgid "You are an officer in this polity." -msgstr "There are no topics in this polity!" - -#: templates/core/polity_detail.html:22 -#, fuzzy -msgid "You are a member of this polity." -msgstr "Members of this polity" - -#: templates/core/polity_detail.html:31 -#, fuzzy -msgid "This polity is delegated." +msgid "This election is delegated." msgstr "This polity has no agreements." -#: templates/core/polity_detail.html:37 -msgid "Your request to join has been sent." -msgstr "Votre demande d'adhésion a été envoyé." - -#: templates/core/polity_detail.html:39 -msgid "Your request to join this polity is still pending." -msgstr "Your request to join this polity is still pending." - -#: templates/core/polity_detail.html:46 -msgid "members" -msgstr "membres" - -#: templates/core/polity_detail.html:47 -msgid "topics" -msgstr "sujets" - -#: templates/core/polity_detail.html:48 -#, fuzzy -msgid "agreements" -msgstr "Agreements" - -#: templates/core/polity_detail.html:49 -msgid "subpolities" -msgstr "subpolities" - -#: templates/core/polity_detail.html:54 templates/core/polity_detail.html:56 -msgid "membership requests" -msgstr "demandes d'adhésion" - -#: templates/core/polity_detail.html:61 -msgid "You have" -msgstr "" - -#: templates/core/polity_detail.html:61 -#, fuzzy -msgid "delegations" -msgstr "Declarations" - -#: templates/core/polity_detail.html:75 -msgid "Show only starred topics" -msgstr "Show only starred topics" - -#: templates/core/polity_detail.html:76 -msgid "New topic" -msgstr "Nouveau sujet" - -#: templates/core/polity_detail.html:81 templates/core/polity_detail.html:88 -#: templates/core/polity_list.html:16 -msgid "Topics" -msgstr "Sujets" - -#: templates/core/polity_detail.html:81 -msgid "of discussion" -msgstr "of discussion" - -#: templates/core/polity_detail.html:83 -msgid "Topics are thematic categories that contain specific issues." -msgstr "Topics are thematic categories that contain specific issues." - -#: templates/core/polity_detail.html:89 templates/core/topic_detail.html:28 -msgid "Issues" -msgstr "Issues" - -#: templates/core/polity_detail.html:90 -msgid "Open Issues" -msgstr "Open Issues" - -#: templates/core/polity_detail.html:91 -msgid "Voting Issues" -msgstr "Voting Issues" - -#: templates/core/polity_detail.html:104 -#, fuzzy -msgid "New issues" -msgstr "New issue" - -#: templates/core/polity_detail.html:104 -#, fuzzy -msgid "in discussion" -msgstr "of discussion" - -#: templates/core/polity_detail.html:106 -#, fuzzy -msgid "These are the newest issues being discussed in this polity." -msgstr "There are no topics in this polity!" - -#: templates/core/polity_detail.html:112 templates/core/polity_detail.html:158 -#: templates/core/topic_detail.html:29 -msgid "State" -msgstr "State" - -#: templates/core/polity_detail.html:114 templates/core/topic_detail.html:31 -msgid "Comments" -msgstr "Comments" - -#: templates/core/polity_detail.html:115 templates/core/polity_detail.html:160 -#: templates/core/topic_detail.html:32 -msgid "Votes" -msgstr "Votes" - -#: templates/core/polity_detail.html:123 templates/core/topic_detail.html:38 -msgid "You have voted on this issue" +#: wasa2il/templates/core/election_detail.html:65 +#: wasa2il/templates/core/topic_detail.html:12 +msgid "View details." msgstr "" -#: templates/core/polity_detail.html:123 templates/core/topic_detail.html:38 -msgid "You have not voted on this issue" +#: wasa2il/templates/core/election_detail.html:73 +msgid "Voting begins" msgstr "" -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -#, fuzzy -msgid "Voting" -msgstr "Voting Issues" - -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -msgid "Open" +#: wasa2il/templates/core/election_detail.html:80 +msgid "Candidacy polities" msgstr "" -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -#, fuzzy -msgid "Closed" -msgstr "Fermer" +#: wasa2il/templates/core/election_detail.html:81 +msgid "You can run" +msgstr "" -#: templates/core/polity_detail.html:141 -#, fuzzy -msgid "New election" -msgstr "Nouvelle réunion" +#: wasa2il/templates/core/election_detail.html:85 +msgid "Voting polities" +msgstr "" -#: templates/core/polity_detail.html:145 -#, fuzzy -msgid "Closed elections" -msgstr "Declarations" +#: wasa2il/templates/core/election_detail.html:86 +msgid "You can vote" +msgstr "" -#: templates/core/polity_detail.html:150 -#, fuzzy -msgid "Elections" -msgstr "Assumptions" +#: wasa2il/templates/core/election_detail.html:95 +msgid "Details ..." +msgstr "" -#: templates/core/polity_detail.html:150 -msgid "putting people in power" +#: wasa2il/templates/core/election_detail.html:105 +#: wasa2il/templates/core/election_detail.html:154 +msgid "About This Election" msgstr "" -#: templates/core/polity_detail.html:152 -msgid "" -"Sometimes you need to put people in their places. Elections do just that." +#: wasa2il/templates/core/election_detail.html:114 +msgid "Election results" msgstr "" -#: templates/core/polity_detail.html:157 -#, fuzzy -msgid "Election" -msgstr "Assumptions" +#: wasa2il/templates/core/election_detail.html:130 +msgid "No votes were cast." +msgstr "" -#: templates/core/polity_detail.html:168 -#, fuzzy -msgid "You have voted in this election" -msgstr "There are no topics in this polity!" +#: wasa2il/templates/core/election_detail.html:134 +msgid "Votes are still being counted." +msgstr "" -#: templates/core/polity_detail.html:168 -#, fuzzy -msgid "You have not voted in this election" -msgstr "There are no topics in this polity!" +#: wasa2il/templates/core/election_detail.html:148 +msgid "your favorites first!" +msgstr "" -#: templates/core/polity_detail.html:184 -msgid "New meeting" -msgstr "Nouvelle réunion" +#: wasa2il/templates/core/election_detail.html:157 +msgid "How To Vote" +msgstr "" -#: templates/core/polity_detail.html:187 templates/core/polity_detail.html:230 -msgid "Show ongoing meetings" -msgstr "Show ongoing meetings" +#: wasa2il/templates/core/election_detail.html:159 +msgid "Click the Start Voting button to begin" +msgstr "" -#: templates/core/polity_detail.html:188 templates/core/polity_detail.html:231 -msgid "Show upcoming meetings" -msgstr "Show upcoming meetings" +#: wasa2il/templates/core/election_detail.html:160 +msgid "Click a Vote button to vote for a candidate" +msgstr "" -#: templates/core/polity_detail.html:189 templates/core/polity_detail.html:232 -msgid "Show finished meetings" -msgstr "Show finished meetings" +#: wasa2il/templates/core/election_detail.html:161 +msgid "Click the arrows to move your favorite candidates to the top" +msgstr "" -#: templates/core/polity_detail.html:193 -msgid "Meetings" -msgstr "Réunions" +#: wasa2il/templates/core/election_detail.html:162 +msgid "Your vote will be counted when the deadline has passed" +msgstr "" -#: templates/core/polity_detail.html:193 -msgid "physical or virtual" -msgstr "physical or virtual" +#: wasa2il/templates/core/election_detail.html:165 +msgid "Start Voting" +msgstr "" -#: templates/core/polity_detail.html:195 -msgid "" -"A meeting is an event where people come together to discuss a set of agenda " -"items." +#: wasa2il/templates/core/election_detail.html:172 +msgid "running in this election" msgstr "" -"A meeting is an event where people come together to discuss a set of agenda " -"items." -#: templates/core/polity_detail.html:199 -msgid "When" -msgstr "When" +#: wasa2il/templates/core/election_detail.html:177 +msgid "Announce candidacy" +msgstr "" -#: templates/core/polity_detail.html:200 -msgid "Where" -msgstr "Where" +#: wasa2il/templates/core/election_detail.html:180 +msgid "Are you sure you want to withdraw? This can not be undone." +msgstr "" -#: templates/core/polity_detail.html:201 -msgid "Organized by" -msgstr "Organized by" +#: wasa2il/templates/core/election_detail.html:182 +msgid "Withdraw candidacy" +msgstr "" -#: templates/core/polity_detail.html:202 -msgid "Status" -msgstr "Status" +#: wasa2il/templates/core/election_list.html:10 +msgid "Elections in polity" +msgstr "" -#: templates/core/polity_detail.html:227 -#, fuzzy -msgid "New delegation" -msgstr "Nouvelle réunion" +#: wasa2il/templates/core/issue_detail.html:24 +msgid "In topics" +msgstr "" -#: templates/core/polity_detail.html:236 -#, fuzzy -msgid "Delegations" -msgstr "Declarations" +#: wasa2il/templates/core/issue_detail.html:27 +msgid "Start time" +msgstr "" -#: templates/core/polity_detail.html:236 -msgid "votes entrusted to others" +#: wasa2il/templates/core/issue_detail.html:29 +msgid "Deadline for discussion" msgstr "" -#: templates/core/polity_detail.html:238 -msgid "You can set up delgations for the polity, for topics, or for issues." +#: wasa2il/templates/core/issue_detail.html:32 +msgid "Deadline for proposals" msgstr "" -#: templates/core/polity_detail.html:239 -msgid "Here you can see all of your active delegations and where they lead to." +#: wasa2il/templates/core/issue_detail.html:53 +msgid "Majority threshold" msgstr "" -#: templates/core/polity_detail.html:249 -msgid "Subpolities" -msgstr "Subpolities" +#: wasa2il/templates/core/issue_detail.html:57 +#: wasa2il/templates/forum/discussion_detail.html:9 +msgid "Discussion" +msgstr "Discussion" -#: templates/core/polity_detail.html:251 -msgid "" -"A polity can have subordinate organizational units, such as how a " -"municipality relates to a country." +#: wasa2il/templates/core/issue_detail.html:68 +#: wasa2il/templates/forum/discussion_detail.html:23 +msgid "Add comment" +msgstr "Ajouter un commentaire" + +#: wasa2il/templates/core/issue_detail.html:77 +msgid "for or against this issue" msgstr "" -"A polity can have subordinate organizational units, such as how a " -"municipality relates to a country." -#: templates/core/polity_detail.html:265 -#: templates/forum/discussion_form.html:5 templates/forum/forum_form.html:5 +#: wasa2il/templates/core/issue_form.html:8 +msgid "version" +msgstr "" + +#: wasa2il/templates/core/issue_form.html:22 +msgid "New issue" +msgstr "New issue" + +#: wasa2il/templates/core/issues_new.html:10 +#: wasa2il/templates/core/polity_detail.html:22 +#: wasa2il/templates/core/polity_detail.html:40 #, fuzzy -msgid "New forum" -msgstr "Nouveau Document" +msgid "New issues" +msgstr "New issue" -#: templates/core/polity_detail.html:268 +#: wasa2il/templates/core/issues_new.html:10 +#: wasa2il/templates/core/polity_detail.html:40 #, fuzzy -msgid "Discussion Forums" -msgstr "Discussion" +msgid "in discussion" +msgstr "of discussion" -#: templates/core/polity_detail.html:270 -msgid "" -"Often it is important to have open-ended discussions on a range of topics " -"outside of particular issues." +#: wasa2il/templates/core/issues_new.html:11 +#: wasa2il/templates/core/polity_detail.html:42 +#, fuzzy +msgid "These are the newest issues being discussed in this polity." +msgstr "There are no topics in this polity!" + +#: wasa2il/templates/core/issues_new.html:29 +#: wasa2il/templates/core/polity_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:30 +msgid "You have voted on this issue" msgstr "" -#: templates/core/polity_detail.html:274 templates/forum/forum_detail.html:18 -msgid "Name" +#: wasa2il/templates/core/issues_new.html:29 +#: wasa2il/templates/core/polity_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:30 +msgid "You have not voted on this issue" msgstr "" -#: templates/core/polity_detail.html:275 templates/forum/forum_detail.html:15 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +msgid "New" +msgstr "" + +#: wasa2il/templates/core/polity_detail.html:9 #, fuzzy -msgid "Discussions" -msgstr "Discussion" +msgid "You are an officer in this polity." +msgstr "There are no topics in this polity!" -#: templates/core/polity_detail.html:276 -msgid "Unseen posts" -msgstr "" +#: wasa2il/templates/core/polity_detail.html:11 +#, fuzzy +msgid "You are a member of this polity." +msgstr "Members of this polity" -#: templates/core/polity_detail.html:299 templates/help/agreement.html:6 +#: wasa2il/templates/core/polity_detail.html:23 +#: wasa2il/templates/core/polity_detail.html:86 +#: wasa2il/templates/help/is/agreement.html:6 msgid "Agreements" msgstr "Agreements" -#: templates/core/polity_detail.html:299 +#: wasa2il/templates/core/polity_detail.html:36 +msgid "Show all new issues" +msgstr "" + +#: wasa2il/templates/core/polity_detail.html:68 +msgid "There are no new issues at the moment." +msgstr "" + +#: wasa2il/templates/core/polity_detail.html:86 msgid "of this polity" msgstr "of this polity" -#: templates/core/polity_detail.html:301 +#: wasa2il/templates/core/polity_detail.html:88 msgid "Here are all of the agreements this polity has arrived at." msgstr "Here are all of the agreements this polity has arrived at." -#: templates/core/polity_detail.html:315 -msgid "Members of this polity" -msgstr "Members of this polity" +#: wasa2il/templates/core/polity_detail.html:99 +#: wasa2il/templates/core/topic_form.html:6 +msgid "New topic" +msgstr "Nouveau sujet" + +#: wasa2il/templates/core/polity_detail.html:103 +msgid "Show only starred topics" +msgstr "Show only starred topics" -#: templates/core/polity_detail.html:335 -msgid "Users requesting membership" -msgstr "Users requesting membership" +#: wasa2il/templates/core/polity_detail.html:107 +msgid "of discussion" +msgstr "of discussion" -#: templates/core/polity_detail.html:371 -msgid "Leave this polity?" -msgstr "Leave this polity?" +#: wasa2il/templates/core/polity_detail.html:109 +msgid "Topics are thematic categories that contain specific issues." +msgstr "Topics are thematic categories that contain specific issues." -#: templates/core/polity_detail.html:374 -msgid "Are you sure you want to stop being a member of this polity?" -msgstr "Are you sure you want to stop being a member of this polity?" +#: wasa2il/templates/core/polity_detail.html:115 +#: wasa2il/templates/core/topic_detail.html:21 +msgid "Issues" +msgstr "Issues" -#: templates/core/polity_detail.html:376 -msgid "Only members get to participate in the polity's activities." -msgstr "Only members get to participate in the polity's activities." +#: wasa2il/templates/core/polity_detail.html:116 +msgid "Open Issues" +msgstr "Open Issues" -#: templates/core/polity_detail.html:380 -msgid "No, I hit that button by accident" -msgstr "No, I hit that button by accident" +#: wasa2il/templates/core/polity_detail.html:117 +msgid "Voting Issues" +msgstr "Voting Issues" -#: templates/core/polity_detail.html:381 -msgid "Yes, I want to leave this polity." -msgstr "Yes, I want to leave this polity." +#: wasa2il/templates/core/polity_detail.html:138 +msgid "Subpolities" +msgstr "Subpolities" -#: templates/core/polity_list.html:7 +#: wasa2il/templates/core/polity_form.html:6 +#: wasa2il/templates/core/polity_list.html:8 msgid "New polity" msgstr "New polity" -#: templates/core/polity_list.html:10 templates/help/polity.html:6 +#: wasa2il/templates/core/polity_list.html:12 +#: wasa2il/templates/help/is/polity.html:6 msgid "Polities" msgstr "Polities" -#: templates/core/polity_list.html:15 -msgid "Members" -msgstr "Members" - -#: templates/core/topic_detail.html:15 +#: wasa2il/templates/core/topic_detail.html:12 msgid "This topic is delegated." msgstr "" -#: templates/core/topic_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:18 +msgid "List of issues" +msgstr "" + +#: wasa2il/templates/core/topic_detail.html:43 msgid "New discussions" msgstr "New discussions" -#: templates/core/topic_detail.html:75 +#: wasa2il/templates/core/topic_detail.html:48 +msgid "in" +msgstr "in" + +#: wasa2il/templates/core/topic_detail.html:60 #, fuzzy msgid "Followers of this topic" msgstr "Members of this polity" -#: templates/forum/discussion_detail.html:7 +#: wasa2il/templates/core/stub/document_view.html:14 +#: wasa2il/templates/core/stub/document_view.html:85 +msgid "Comparison" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:15 +msgid "Comparison in progress..." +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:84 +msgid "Text" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:89 +msgid "Compared to" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +msgid "predecessor" +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:9 +msgid "This proposal has been accepted by vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:11 +msgid "" +"This content is still merely a proposal and has not yet been accepted by " +"vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:13 +msgid "This proposal has been rejected by vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:15 +msgid "This proposal is deprecated. A newer version has taken effect." +msgstr "" + +#: wasa2il/templates/forum/discussion_detail.html:7 #, fuzzy msgid "Back to forum" msgstr "Retour en haut" -#: templates/forum/discussion_detail.html:12 +#: wasa2il/templates/forum/discussion_detail.html:12 #, fuzzy msgid "This discussion is closed." msgstr "of discussion" -#: templates/forum/forum_detail.html:8 +#: wasa2il/templates/forum/discussion_form.html:5 +#: wasa2il/templates/forum/forum_form.html:5 +#, fuzzy +msgid "New forum" +msgstr "Nouveau Document" + +#: wasa2il/templates/forum/forum_detail.html:8 #, fuzzy msgid "New discussion" msgstr "New discussions" -#: templates/forum/forum_detail.html:10 +#: wasa2il/templates/forum/forum_detail.html:10 msgid "Forum:" msgstr "" -#: templates/forum/forum_detail.html:19 +#: wasa2il/templates/forum/forum_detail.html:15 +#, fuzzy +msgid "Discussions" +msgstr "Discussion" + +#: wasa2il/templates/forum/forum_detail.html:19 msgid "Messages" msgstr "" -#: templates/forum/forum_detail.html:20 +#: wasa2il/templates/forum/forum_detail.html:20 msgid "Participants" msgstr "" -#: templates/forum/forum_detail.html:36 +#: wasa2il/templates/forum/forum_detail.html:36 #, fuzzy msgid "Followers of this forum" msgstr "Members of this polity" -#: templates/forum/forum_form.html:16 +#: wasa2il/templates/forum/forum_form.html:16 msgid "Name:" msgstr "" -#: templates/help/agreement.html:8 +#: wasa2il/templates/help/is/agreement.html:61 #, fuzzy msgid "" "\n" "

      \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

      \n" "

      \n" "There's a lot of \"generally\" in there, because different polities do " @@ -1344,73 +1212,74 @@ msgid "" "

      \n" "

      Conditions of adoption

      \n" "

      \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

      \n" -"

      More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

      More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

      \n" -"

      A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

      A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

      \n" "

      Document structure

      \n" "

      \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

      \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
      \n" "\t

      0047/2010

      \n" "\t

      Written declaration on the establishment of " "European Home-Made Ice Cream Day

      \n" "\t

      The European Parliament,

      \n" -"\t

      —   having regard to Rule 123 of " -"its Rules of Procedure,

      \n" +"\t

      —   having regard to Rule 123 " +"of its Rules of Procedure,

      \n" "\t
        \n" "\t\t
      1. whereas the quality of food is a distinctive feature of European " "products and home-made ice cream is synonymous \n" "\t\twith quality as far as fresh dairy products are concerned,
      2. \n" -"\t\t
      3. whereas in some areas home-made ice cream is a typical food product " -"in the fresh dairy \n" +"\t\t
      4. whereas in some areas home-made ice cream is a typical food " +"product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
      5. \n" -"\t\t
      6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
      7. \n" +"\t\t
      8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
      9. \n" "\t
      \n" "\t
        \n" -"\t\t
      1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\t\t
      2. Calls on the Member States to support the quality product that is" +" home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
      3. \n" -"\t\t
      4. Considers it important, to that end, to establish European Home-Made " -"Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\t\t
      5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
      6. \n" +"\t\t
      7. Considers it important, to that end, to establish European Home-" +"Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
      8. \n" +"\t\t
      9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
      10. \n" "\t
      \n" "
      \n" "

      \n" @@ -1419,10 +1288,10 @@ msgstr "" "

      \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

      \n" "

      \n" "There's a lot of \"generally\" in there, because different polities do " @@ -1430,110 +1299,111 @@ msgstr "" "

      \n" "

      Conditions of adoption

      \n" "

      \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

      \n" -"

      More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

      More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

      \n" -"

      A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

      A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

      \n" "

      Document structure

      \n" "

      \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

      \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
      \n" "\\t

      0047/2010

      \n" "\\t

      Written declaration on the establishment of " "European Home-Made Ice Cream Day

      \n" "\\t

      The European Parliament,

      \n" -"\\t

      —   having regard to Rule 123 of " -"its Rules of Procedure,

      \n" +"\\t

      —   having regard to Rule 123" +" of its Rules of Procedure,

      \n" "\\t
        \n" -"\\t\\t
      1. whereas the quality of food is a distinctive feature of European " -"products and home-made ice cream is synonymous \n" +"\\t\\t
      2. whereas the quality of food is a distinctive feature of " +"European products and home-made ice cream is synonymous \n" "\\t\\twith quality as far as fresh dairy products are concerned,
      3. \n" "\\t\\t
      4. whereas in some areas home-made ice cream is a typical food " "product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
      5. \n" -"\\t\\t
      6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
      7. \n" +"\\t\\t
      8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
      9. \n" "\\t
      \n" "\\t
        \n" -"\\t\\t
      1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\\t\\t
      2. Calls on the Member States to support the quality product that " +"is home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
      3. \n" -"\\t\\t
      4. Considers it important, to that end, to establish European Home-" -"Made Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\\t\\t
      5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
      6. \n" +"\\t\\t
      7. Considers it important, to that end, to establish European " +"Home-Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
      8. \n" +"\\t\\t
      9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
      10. \n" "\\t
      \n" "
      \n" "

      \n" -#: templates/help/agreement.html:64 +#: wasa2il/templates/help/is/agreement.html:64 msgid "The title" msgstr "The title" -#: templates/help/agreement.html:64 +#: wasa2il/templates/help/is/agreement.html:64 msgid "" -"Agreements may have various forms of reference. One is a reference number, " -"which should be unique and cannonical. Another is a human readable title " -"that is descriptive. Some polities might choose not to use either one, but " -"rules around this should generally be decided on." +"Agreements may have various forms of reference. One is a reference " +"number, which should be unique and cannonical. Another is a human " +"readable title that is descriptive. Some polities might choose not to use" +" either one, but rules around this should generally be decided on." msgstr "" -"Agreements may have various forms of reference. One is a reference number, " -"which should be unique and cannonical. Another is a human readable title " -"that is descriptive. Some polities might choose not to use either one, but " -"rules around this should generally be decided on." +"Agreements may have various forms of reference. One is a reference " +"number, which should be unique and cannonical. Another is a human " +"readable title that is descriptive. Some polities might choose not to use" +" either one, but rules around this should generally be decided on." -#: templates/help/agreement.html:65 +#: wasa2il/templates/help/is/agreement.html:65 msgid "The polity" msgstr "The polity" -#: templates/help/agreement.html:65 +#: wasa2il/templates/help/is/agreement.html:65 msgid "" -"Many polities make sure that their agreements contain their name, so as not " -"to be confusing." +"Many polities make sure that their agreements contain their name, so as " +"not to be confusing." msgstr "" -"Many polities make sure that their agreements contain their name, so as not " -"to be confusing." +"Many polities make sure that their agreements contain their name, so as " +"not to be confusing." -#: templates/help/agreement.html:66 +#: wasa2il/templates/help/is/agreement.html:66 msgid "References section" msgstr "References section" -#: templates/help/agreement.html:66 +#: wasa2il/templates/help/is/agreement.html:66 msgid "" "In the references section, a polity may choose to include references to " "previous agreements, or articles in those agreements." @@ -1541,58 +1411,65 @@ msgstr "" "In the references section, a polity may choose to include references to " "previous agreements, or articles in those agreements." -#: templates/help/agreement.html:67 +#: wasa2il/templates/help/is/agreement.html:67 msgid "Assumptions section" msgstr "Assumptions section" -#: templates/help/agreement.html:67 +#: wasa2il/templates/help/is/agreement.html:67 msgid "" -"The assumptions section generally contains a list of assumptions that are " -"being made. Often these are factual references, or slightly more oblique " -"references to previous decisions. Sometimes they're bizzarre statements of " -"opinion, or even, if used incorrectly, declarations of their own right." -msgstr "" -"The assumptions section generally contains a list of assumptions that are " -"being made. Often these are factual references, or slightly more oblique " -"references to previous decisions. Sometimes they're bizzarre statements of " -"opinion, or even, if used incorrectly, declarations of their own right." - -#: templates/help/agreement.html:68 +"The assumptions section generally contains a list of assumptions that are" +" being made. Often these are factual references, or slightly more oblique" +" references to previous decisions. Sometimes they're bizzarre statements " +"of opinion, or even, if used incorrectly, declarations of their own " +"right." +msgstr "" +"The assumptions section generally contains a list of assumptions that are" +" being made. Often these are factual references, or slightly more oblique" +" references to previous decisions. Sometimes they're bizzarre statements " +"of opinion, or even, if used incorrectly, declarations of their own " +"right." + +#: wasa2il/templates/help/is/agreement.html:68 msgid "Declarations section" msgstr "Declarations section" -#: templates/help/agreement.html:68 +#: wasa2il/templates/help/is/agreement.html:68 msgid "" -"This is the meat of the agreement. It contains one or more statements which " -"are considered to be agreed upon by the polity when the document is adopted. " -"One might even call this the law." +"This is the meat of the agreement. It contains one or more statements " +"which are considered to be agreed upon by the polity when the document is" +" adopted. One might even call this the law." msgstr "" -"This is the meat of the agreement. It contains one or more statements which " -"are considered to be agreed upon by the polity when the document is adopted. " -"One might even call this the law." +"This is the meat of the agreement. It contains one or more statements " +"which are considered to be agreed upon by the polity when the document is" +" adopted. One might even call this the law." -#: templates/help/agreement.html:71 templates/help/polity.html:117 -#: templates/help/proposal.html:62 templates/help/wasa2il.html:28 +#: wasa2il/templates/help/is/agreement.html:71 +#: wasa2il/templates/help/is/polity.html:117 +#: wasa2il/templates/help/is/proposal.html:62 msgid "Related help pages" msgstr "Related help pages" -#: templates/help/agreement.html:73 +#: wasa2il/templates/help/is/agreement.html:73 msgid "How does one make a proposal?" msgstr "How does one make a proposal?" -#: templates/help/agreement.html:74 templates/help/index.html:13 -#: templates/help/polity.html:120 templates/help/proposal.html:65 -#: templates/help/wasa2il.html:30 +#: wasa2il/templates/help/is/agreement.html:74 +#: wasa2il/templates/help/is/index.html:13 +#: wasa2il/templates/help/is/polity.html:120 +#: wasa2il/templates/help/is/proposal.html:65 msgid "How does electronic democracy work?" msgstr "Comment fonctionne la démocratie électronique ?" -#: templates/help/authors.html:8 +#: wasa2il/templates/help/is/authors.html:50 msgid "" "\n" "

      Developers:

      \n" "
        \n" "
      • Smári McCarthy
      • \n" "
      • Tómas Árni Jónasson
      • \n" +"
      • Helgi Hrafn Gunnarsson
      • \n" +"
      • Björn Leví Gunnarsson
      • \n" +"
      • Bjarni Rúnar Einarsson
      • \n" "
      \n" "

      Contributors:

      \n" "
        \n" @@ -1601,6 +1478,10 @@ msgid "" "
      • Zineb Belmkaddem
      • \n" "
      • Þórgnýr Thoroddssen
      • \n" "
      • Stefán Vignir Skarphéðinsson
      • \n" +"
      • Jóhann Haukur Gunnarsson
      • \n" +"
      • Steinn Eldjárn Sigurðarson
      • \n" +"
      • Björgvin Ragnarsson
      • \n" +"
      • Viktor Smári
      • \n" "
      \n" "\n" "

      Translations:

      \n" @@ -1613,7 +1494,7 @@ msgid "" "\n" "

      Icelandic:

      \n" "
        \n" -"
      • Eva Þurríðardóttir
      • \n" +"
      • Eva Þuríðardóttir
      • \n" "
      • Smári McCarthy
      • \n" "
      • Tómas Árni Jónasson
      • \n" "
      \n" @@ -1625,61 +1506,67 @@ msgid "" "\n" msgstr "" -#: templates/help/copyright.html:6 +#: wasa2il/templates/help/is/copyright.html:6 msgid "Copyright" msgstr "" -#: templates/help/copyright.html:8 +#: wasa2il/templates/help/is/copyright.html:10 msgid "" "\n" "This is free software, licensed under the GNU Affero General Public " "License.\n" msgstr "" -#: templates/help/index.html:8 +#: wasa2il/templates/help/is/index.html:8 msgid "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." msgstr "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." -#: templates/help/index.html:9 +#: wasa2il/templates/help/is/index.html:9 msgid "" -"If you ever feel like you aren't getting a good enough explanation, please " -"\n" -"Polities are groups of people who come together to make decisions and enact " -"their will.\n" -"These are given various names depending on their form, structure, intent, " -"scale and scope.\n" +"Polities are groups of people who come together to make decisions and " +"enact their will.\n" +"These are given various names depending on their form, structure, intent," +" scale and scope.\n" "Therefore they are variously called \"countries\", \"towns\", \"clubs\", " "\"cabals\", \"mafias\", \"federations\",\n" "\"treaties\", \"unions\", \"associations\", \"companies\", \"phyles\", " @@ -1689,52 +1576,54 @@ msgid "" "

      \n" "The reason we use the word \"polity\" in Wasa2il is that it is the most " "generic term we could\n" -"find. It says nothing of the form, the structure, the intent, scale or scope " -"of the group\n" +"find. It says nothing of the form, the structure, the intent, scale or " +"scope of the group\n" "of people, nor does it preclude anything. Using the word \"group\" could " "work too, but it lacks\n" "the imporant factor that there is an intent to make decisions and enact " "will.\n" "

      \n" "

      \n" -"In addition to consisting of a group of people, a polity will have a set of " -"laws\n" -"the group has decided to adhere to. In an abstract sense, membership in a " -"polity\n" -"grants a person certain rights and priviledges. For instance, membership in " -"a \n" -"school's student body may grant you the right to attend their annual prom,\n" +"In addition to consisting of a group of people, a polity will have a set " +"of laws\n" +"the group has decided to adhere to. In an abstract sense, membership in a" +" polity\n" +"grants a person certain rights and priviledges. For instance, membership " +"in a \n" +"school's student body may grant you the right to attend their annual " +"prom,\n" "and membership in a country (i.e. residency or citizenship) grants you a " "right \n" -"to live there and do certain things there, such as start companies. stand " -"in \n" +"to live there and do certain things there, such as start companies. stand" +" in \n" "elections, and so on.\n" "

      \n" "

      \n" -"Each polity has different rules - these are also called statutes, bylaws or " -"laws - \n" +"Each polity has different rules - these are also called statutes, bylaws " +"or laws - \n" "which affect the polity on two different levels.\n" "

      \n" "

      \n" "Firstly, there are meta-rules, which describe how rules are formed, how\n" -"decisions are made, how meetings happen, and how governance in general \n" +"decisions are made and how governance in general \n" "happens. Wasa2il has to be flexible enough to accomodate the varying \n" -"meta-rules of a given polity, otherwise the polity may decide that Wasa2il " -"isn't \n" -"useful to them. Sometimes these rules are referred to as \"rules of procedure" -"\" \n" -"or \"constitution\", depending on the type of polity which is using them.\n" +"meta-rules of a given polity, otherwise the polity may decide that " +"Wasa2il isn't \n" +"useful to them. Sometimes these rules are referred to as \"rules of " +"procedure\" \n" +"or \"constitution\", depending on the type of polity which is using them." +"\n" "

      \n" "

      \n" -"Secondly there are external rules, which are the decisions the polity makes " -"which\n" +"Secondly there are external rules, which are the decisions the polity " +"makes which\n" "don't affect its internal decisionmaking process.\n" "

      \n" "

      \n" -"It is hard to talk about a term completely in the abstract. We can describe " -"its features, but\n" -"that only gets us so far. So let's look at some of the things that can vary " -"from one polity\n" +"It is hard to talk about a term completely in the abstract. We can " +"describe its features, but\n" +"that only gets us so far. So let's look at some of the things that can " +"vary from one polity\n" "to another, and then take a few examples in each.\n" "

      \n" "

      Scope

      \n" @@ -1746,57 +1635,57 @@ msgid "" "a common interest of its members.\n" "

      \n" "

      \n" -"La Casa Invisible is a social center in Málaga, Spain, which works in " -"the Málaga region\n" -"to promote ideas of social cohesion, autonomy, and democracy. It operates a " -"café, a book store,\n" -"a music hall, and various other projects, each of which could be considered " -"a sub-polity of\n" -"the social center itself. The scope of La Casa Invisible's actions is mostly " -"bound to decisions\n" +"La Casa Invisible is a social center in Málaga, Spain, which works" +" in the Málaga region\n" +"to promote ideas of social cohesion, autonomy, and democracy. It operates" +" a café, a book store,\n" +"a music hall, and various other projects, each of which could be " +"considered a sub-polity of\n" +"the social center itself. The scope of La Casa Invisible's actions is " +"mostly bound to decisions\n" "regarding the social center itself, and the activities that take place " "within it.\n" "

      \n" "

      \n" -"The Union of the Comoros (Udzima wa Komori) is an island nation to " -"the east of Africa, \n" -"just north of Madagascar. It has a population of 798.000 people living in an " -"area of 2.235km². \n" -"The scope of The Comoros as a polity is the land and national waters they " -"control, their airspace,\n" -"and their foreign trade, defense and other agreements they are party to. As " -"such, they have\n" -"municipal sub-polities, and are a member of the African Union, Francophonie, " -"Organization of Islamic\n" -"Cooperation, Arab League and Indian Ocean Commission superpolities, amongst " -"others.\n" +"The Union of the Comoros (Udzima wa Komori) is an island nation to" +" the east of Africa, \n" +"just north of Madagascar. It has a population of 798.000 people living in" +" an area of 2.235km². \n" +"The scope of The Comoros as a polity is the land and national waters they" +" control, their airspace,\n" +"and their foreign trade, defense and other agreements they are party to. " +"As such, they have\n" +"municipal sub-polities, and are a member of the African Union, " +"Francophonie, Organization of Islamic\n" +"Cooperation, Arab League and Indian Ocean Commission superpolities, " +"amongst others.\n" "

      \n" "

      Scale

      \n" "

      \n" "The scale of a polity determines how large it can be expected to become. " "Some polities are specifically\n" -"structured with intent to grow, while others intentionally try to stay at a " -"constant size.\n" +"structured with intent to grow, while others intentionally try to stay at" +" a constant size.\n" "

      \n" "

      \n" -"Muff Divers is a diving club in the village of Muff in Ireland. It " -"claims to be the fastest\n" +"Muff Divers is a diving club in the village of Muff in Ireland. It" +" claims to be the fastest\n" "growing diving club in the world, most likely owing to its name.\n" "

      \n" "

      Intent

      \n" "

      \n" "A polity is created around intent. Some polities intend to take over the " "world, others intend to make\n" -"the nicest cupcakes in all of the land. Some polities intend to send people " -"into space, and others\n" +"the nicest cupcakes in all of the land. Some polities intend to send " +"people into space, and others\n" "intend to track down and arrest criminals. Polities have all sorts of " "motives and intents.\n" "

      \n" "

      \n" "On the most basic level, a polity's intent is a description of what it " "intends to do. This has nothing\n" -"to do with whether the polity has the ability to do it, or whether anybody " -"or anything - such as another\n" +"to do with whether the polity has the ability to do it, or whether " +"anybody or anything - such as another\n" "polity, or the laws of physics - stand in their way.\n" "

      \n" "

      \n" @@ -1806,16 +1695,16 @@ msgid "" "

      \n" "Representative democracy, direct democracy, participatory democracy, " "dictatorship. There are lots of terms\n" -"which describe the structure of a polity. In one sense, it refers to where " -"in the structure of relations\n" +"which describe the structure of a polity. In one sense, it refers to " +"where in the structure of relations\n" "between people the authority lies. In a dictatorship, one person has " "ultimate authority, although he may\n" -"choose to grant some authority downstream to trusted advisors, who in turn " -"have trusted advisors, and so\n" -"on. In a fully egealitarian system, each individual is equipotent, meaning " -"he has an equal ability to\n" -"everybody else to instigate decisions - however, it depends on the structure " -"what ability the individual\n" +"choose to grant some authority downstream to trusted advisors, who in " +"turn have trusted advisors, and so\n" +"on. In a fully egealitarian system, each individual is equipotent, " +"meaning he has an equal ability to\n" +"everybody else to instigate decisions - however, it depends on the " +"structure what ability the individual\n" "has to actually complete the decision making.\n" "

      \n" "

      \n" @@ -1829,37 +1718,37 @@ msgid "" "

      \n" msgstr "" -#: templates/help/proposal.html:6 +#: wasa2il/templates/help/is/proposal.html:6 msgid "Proposals" msgstr "Proposals" -#: templates/help/proposal.html:8 +#: wasa2il/templates/help/is/proposal.html:60 #, fuzzy msgid "" "\n" "

      \n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

      \n" "

      \n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

      \n" "

      \n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -1867,14 +1756,14 @@ msgid "" "

      \n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

      \n" "

      Proposing a new agreement

      \n" "

      \n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

      \n" "

      Proposing changes to a previous agreement

      \n" "

      \n" @@ -1888,10 +1777,10 @@ msgid "" "

      \n" "

      Making changes to a proposal

      \n" "

      \n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

        \n" "\t
      1. Remove a clause/statement from the document
      2. \n" "\t
      3. Move a clause/statement within the document
      4. \n" @@ -1902,8 +1791,9 @@ msgid "" "

        \n" "

        Voting on a proposal

        \n" "

        \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " @@ -1914,26 +1804,26 @@ msgstr "" "

        \n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

        \n" "

        \n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

        \n" "

        \n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -1941,14 +1831,14 @@ msgstr "" "

        \n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

        \n" "

        Proposing a new agreement

        \n" "

        \n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

        \n" "

        Proposing changes to a previous agreement

        \n" "

        \n" @@ -1962,10 +1852,10 @@ msgstr "" "

        \n" "

        Making changes to a proposal

        \n" "

        \n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

          \n" "\\t
        1. Remove a clause/statement from the document
        2. \n" "\\t
        3. Move a clause/statement within the document
        4. \n" @@ -1976,23 +1866,25 @@ msgstr "" "

          \n" "

          Voting on a proposal

          \n" "

          \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " "individually first.\n" "

          \n" -#: templates/help/wasa2il.html:8 +#: wasa2il/templates/help/is/wasa2il.html:26 msgid "" "\n" "

          \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

          \n" "

          \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2002,24 +1894,25 @@ msgid "" "goals and mutual understandings.\n" "

          \n" "

          \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

          \n" msgstr "" "\n" "

          \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

          \n" "

          \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2029,80 +1922,276 @@ msgstr "" "goals and mutual understandings.\n" "

          \n" "

          \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

          \n" -#: templates/registration/activate.html:5 +#: wasa2il/templates/registration/activate.html:5 msgid "Welcome to Wasa2il!" msgstr "Bienvenue à Wasa2il!" -#: templates/registration/activate.html:6 +#: wasa2il/templates/registration/activate.html:6 msgid "You are now successfully signed up. Sign in to start having fun!" msgstr "You are now successfully signed up. Sign in to start having fun!" -#: templates/registration/login.html:6 +#: wasa2il/templates/registration/activation_complete.html:7 +msgid "Email verified!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:11 +msgid "Congratulations, your email has been verified!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:12 +msgid "You may now try to log in!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:13 +#: wasa2il/templates/registration/login.html:22 +msgid "Login" +msgstr "" + +#: wasa2il/templates/registration/activation_email.txt:2 +msgid "Please click the link below to verify your email address." +msgstr "" + +#: wasa2il/templates/registration/activation_email.txt:6 +#, python-format +msgid "This link will be active for %(expiration_days)s days." +msgstr "" + +#: wasa2il/templates/registration/activation_email_subject.txt:2 +#: wasa2il/templates/registration/registration_complete.html:7 +msgid "Email verification" +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:3 +msgid "" +"As of February 12th 2014, we require the verification of all user " +"accounts via the so-called Icekey." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:5 +msgid "" +"Please be advised that by registering and verifying your account, you " +"become a member of the Pirate Party of Iceland." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:7 +msgid "" +"Membership of political organizations is considered sensitive information" +" by law." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:8 +msgid "" +"Therefore, you should keep the following in mind when becoming a member " +"and using our system:" +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:10 +msgid "" +"Your username is publicly visible. If you don't want to be recognized, " +"use a different one than what you use elsewhere." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:11 +msgid "" +"Your profile settings are mostly public, including your " +"display name, image and description. We don't fill that out for you, " +"though." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:12 +msgid "Don't put anything in there that you don't want visible to the public." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:13 +msgid "We do not display your email address in public." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:14 +msgid "If you have questions or concerns regarding privacy, please email us:" +msgstr "" + +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/registration_form.html:6 msgid "and partake in democracy..." msgstr "" -#: templates/registration/login.html:17 -#: templates/registration/password_reset_complete.html:5 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:5 -#: templates/registration/password_reset_form.html:5 +#: wasa2il/templates/registration/login.html:9 +msgid "" +"If you forgot your username, you can log in or reset your password with " +"your email address or SSN instead." +msgstr "" + +#: wasa2il/templates/registration/login.html:11 +msgid "If problems arise, please send an email to the following email address:" +msgstr "" + +#: wasa2il/templates/registration/login.html:24 +#: wasa2il/templates/registration/password_reset_complete.html:5 +#: wasa2il/templates/registration/password_reset_confirm.html:8 +#: wasa2il/templates/registration/password_reset_done.html:5 +#: wasa2il/templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "" -#: templates/registration/password_change_done.html:7 -msgid "Password changed" +#: wasa2il/templates/registration/logout.html:7 +msgid "Logged out" +msgstr "" + +#: wasa2il/templates/registration/logout.html:10 +msgid "We hope you'll be back soon. It'd be fun!" +msgstr "" + +#: wasa2il/templates/registration/password_change_done.html:11 +msgid "Success! Your password has been changed." +msgstr "" + +#: wasa2il/templates/registration/password_change_done.html:13 +msgid "Back to settings" msgstr "" -#: templates/registration/password_reset_complete.html:7 +#: wasa2il/templates/registration/password_reset_complete.html:7 msgid "Password reset successfully" msgstr "" -#: templates/registration/password_reset_confirm.html:18 +#: wasa2il/templates/registration/password_reset_confirm.html:22 +msgid "Error" +msgstr "" + +#: wasa2il/templates/registration/password_reset_confirm.html:23 msgid "Password reset failed" msgstr "" -#: templates/registration/password_reset_done.html:6 -msgid "Email with password reset instructions has been sent." +#: wasa2il/templates/registration/password_reset_done.html:5 +msgid "Check your email!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:7 +msgid "Email with password reset instructions may have been sent." +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:9 +#: wasa2il/templates/registration/password_reset_form.html:15 +msgid "Hints:" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:11 +msgid "Check your spam folder!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:12 +msgid "" +"If you do not receive an email, try resetting your password with other " +"email addresses you may have used." +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:13 +msgid "" +"For security and privacy reasons, we cannot tell you whether you used the" +" correct email address. Sorry!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:14 +msgid "Still nothing? Try creating a new account." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: wasa2il/templates/registration/password_reset_email.html:2 #, python-format -msgid "Reset password at %(site_name)s" +msgid "Someone (probably you) requested a password reset at %(site_name)s." +msgstr "" + +#: wasa2il/templates/registration/password_reset_email.html:4 +msgid "If you are unfamiliar with this request, you should ignore this message." +msgstr "" + +#: wasa2il/templates/registration/password_reset_email.html:6 +msgid "To reset your password, please click the following link:" +msgstr "" + +#: wasa2il/templates/registration/password_reset_form.html:5 +msgid "The tricky email question" msgstr "" -#: templates/registration/password_reset_form.html:9 +#: wasa2il/templates/registration/password_reset_form.html:11 msgid "Send password" msgstr "" -#, fuzzy -#~ msgid "Select topics" -#~ msgstr "Nouveau sujet" +#: wasa2il/templates/registration/password_reset_form.html:17 +msgid "Not sure which email you used? Try them all!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_subject.txt:2 +msgid "Password reset requested" +msgstr "" + +#: wasa2il/templates/registration/registration_complete.html:11 +msgid "" +"Please check your email to find the verification message we have just " +"sent, and click the appropriate link." +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:6 +msgid "Verification error" +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:8 +msgid "" +"The following error occurred during the processing of your account's " +"verification:" +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:14 +msgid "Please try again and if the error persists, contact an administrator." +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:6 +msgid "Multiple accounts detected" +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:8 +msgid "" +"It appears that you already have a different account. Its username and " +"email address are provided below. Please try logging in again using its " +"credentials." +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:9 +msgid "If you have any further problems, please contact an administrator." +msgstr "" -#~ msgid "Back to document list" -#~ msgstr "Back to document list" +#: wasa2il/templates/registration/verification_duplicate.html:11 +msgid "Username" +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:12 +msgid "Email" +msgstr "" -#~ msgid "View this document" -#~ msgstr "Afficher ce document" +#: wasa2il/templates/registration/verification_needed.html:6 +msgid "Verification needed" +msgstr "" -#~ msgid "[Unnumbered proposal]" -#~ msgstr "[Unnumbered proposal]" +#: wasa2il/templates/registration/verification_needed.html:8 +msgid "" +"The account registration process cannot be completed until verification " +"has been provided." +msgstr "" -#~ msgid "Propose alternative" -#~ msgstr "Proposer une alternative" +#: wasa2il/templates/registration/verification_needed.html:9 +msgid "Please select one of the following options" +msgstr "" -#~ msgid "Add agenda item" -#~ msgstr "Add agenda item" +#: wasa2il/templates/registration/verification_needed.html:11 +msgid "Verify identity" +msgstr "" -#~ msgid "ID" -#~ msgstr "ID" diff --git a/wasa2il/locale/is/LC_MESSAGES/django.po b/wasa2il/locale/is/LC_MESSAGES/django.po index 47a866f4..d7ff8116 100644 --- a/wasa2il/locale/is/LC_MESSAGES/django.po +++ b/wasa2il/locale/is/LC_MESSAGES/django.po @@ -1,27 +1,28 @@ + msgid "" msgstr "" -"Project-Id-Version: wasa2il\n" +"Project-Id-Version: wasa2il\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-30 16:24+0000\n" +"POT-Creation-Date: 2016-08-10 10:13+0000\n" "PO-Revision-Date: 2013-01-31 22:03+0100\n" "Last-Translator: smari \n" +"Language: is\n" "Language-Team: Icelandic\n" -"Language: is_IS\n" +"Plural-Forms: nplurals=2; plural=n != 1\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: crowdin.net\n" +"Generated-By: Babel 2.3.4\n" -#: core/authentication.py:20 core/forms.py:46 +#: core/authentication.py:57 core/forms.py:46 msgid "E-mail" msgstr "Netfang" -#: core/authentication.py:21 +#: core/authentication.py:58 msgid "Password" msgstr "Lykilorð" -#: core/base_classes.py:8 core/models.py:45 +#: core/base_classes.py:8 core/models.py:46 #: wasa2il/templates/forum/forum_detail.html:18 msgid "Name" msgstr "Nafn" @@ -34,1350 +35,345 @@ msgstr "Netfangið sem þú vilt nota á vefnum." msgid "Filename must contain file extension" msgstr "Ending skráarnafns verður að tilgreina tegund" -#: core/models.py:31 +#: core/models.py:32 msgid "Description" msgstr "Lýsing" -#: core/models.py:45 +#: core/models.py:46 msgid "The name to display on the site." msgstr "Nafnið sem birtist á vefnum." -#: core/models.py:46 +#: core/models.py:47 msgid "E-mail visible" msgstr "Netfang sýnilegt" -#: core/models.py:46 +#: core/models.py:47 #, fuzzy msgid "Whether to display your email address on your profile page." msgstr "Við sýnum ekki netföng notenda okkar opinberlega." -#: core/models.py:47 +#: core/models.py:48 msgid "Bio" msgstr "Saga" -#: core/models.py:48 +#: core/models.py:49 msgid "Picture" msgstr "Mynd" -#: core/models.py:52 +#: core/models.py:53 msgid "Language" msgstr "Tungumál" -#: core/models.py:53 +#: core/models.py:54 msgid "Whether to show all topics in a polity, or only starred." msgstr "Hvort eigi að sýna mál þings, eða einungis stjörnumerkt." -#: core/models.py:154 +#: core/models.py:170 msgid "Officers" msgstr "Umsjónarmenn" -#: core/models.py:157 +#: core/models.py:172 msgid "Publicly listed?" msgstr "Listað opinberlega?" -#: core/models.py:157 +#: core/models.py:172 msgid "Whether the polity is publicly listed or not." msgstr "Hvort þingið sé listað opinberlega eður ei." -#: core/models.py:158 +#: core/models.py:173 msgid "Publicly viewable?" msgstr "Sýnilegt opinberlega?" -#: core/models.py:158 +#: core/models.py:173 msgid "Whether non-members can view the polity and its activities." msgstr "" -"Hvort notendur sem ekki eru meðlimir þingsins geti séð það og innihald þess." +"Hvort notendur sem ekki eru meðlimir þingsins geti séð það og innihald " +"þess." -#: core/models.py:159 +#: core/models.py:174 msgid "Can only officers make new issues?" msgstr "Geta einungis umsjónarmenn búið til ný mál?" -#: core/models.py:159 +#: core/models.py:174 msgid "" -"If this is checked, only officers can create new issues. If it's unchecked, " -"any member can start a new issue." +"If this is checked, only officers can create new issues. If it's " +"unchecked, any member can start a new issue." msgstr "" -"Ef þetta er valið geta einungis umsjónarmenn búið til ný mál. Ellegar geta " -"allir meðlimir búið til ný mál." +"Ef þetta er valið geta einungis umsjónarmenn búið til ný mál. Ellegar " +"geta allir meðlimir búið til ný mál." -#: core/models.py:160 +#: core/models.py:175 msgid "Front polity?" msgstr "Aðalþing?" -#: core/models.py:160 +#: core/models.py:175 msgid "" "If checked, this polity will be displayed on the front page. The first " "created polity automatically becomes the front polity." msgstr "" -"Ef hakað er við þetta verður þetta þing sýnt á forsíðunni. Fyrsta þingið sem " -"búið er til verður sjálfkrafa að aðalþingi." +"Ef hakað er við þetta verður þetta þing sýnt á forsíðunni. Fyrsta þingið " +"sem búið er til verður sjálfkrafa að aðalþingi." -#: core/models.py:288 +#: core/models.py:303 msgid "Accepted at assembly" msgstr "Samþykkt á samkomu" -#: core/models.py:289 +#: core/models.py:304 msgid "Rejected at assembly" msgstr "Hafnað á samkomu" -#: core/models.py:298 wasa2il/templates/core/polity_detail.html:24 -#: wasa2il/templates/core/polity_detail.html:96 -#: wasa2il/templates/core/polity_detail.html:103 +#: core/models.py:313 wasa2il/templates/core/polity_detail.html:24 +#: wasa2il/templates/core/polity_detail.html:107 +#: wasa2il/templates/core/polity_detail.html:114 #: wasa2il/templates/core/polity_list.html:17 msgid "Topics" msgstr "Málaflokkar" -#: core/models.py:304 +#: core/models.py:319 msgid "Ruleset" msgstr "Reglur" -#: core/models.py:306 wasa2il/templates/core/issue_detail.html:39 +#: core/models.py:321 wasa2il/templates/core/issue_detail.html:39 msgid "Special process" msgstr "Sérstakur ferill" -#: core/models.py:495 wasa2il/templates/core/issues_new.html:18 -#: wasa2il/templates/core/polity_detail.html:46 +#: core/models.py:510 wasa2il/templates/core/issues_new.html:18 +#: wasa2il/templates/core/polity_detail.html:47 msgid "Issue" msgstr "Málefni" -#: core/models.py:500 +#: core/models.py:515 msgid "Topic" msgstr "Málaflokkur" -#: core/models.py:505 wasa2il/templates/core/polity_list.html:16 +#: core/models.py:520 wasa2il/templates/core/polity_list.html:16 msgid "Polity" msgstr "Þing" -#: core/models.py:644 +#: core/models.py:659 msgid "Proposed" msgstr "Tillaga" -#: core/models.py:645 wasa2il/templates/core/issue_detail.html:49 +#: core/models.py:660 wasa2il/templates/core/issue_detail.html:49 msgid "Accepted" msgstr "Samþykkt" -#: core/models.py:646 wasa2il/templates/core/issue_detail.html:49 +#: core/models.py:661 wasa2il/templates/core/issue_detail.html:49 msgid "Rejected" msgstr "Hafnað" -#: core/models.py:647 +#: core/models.py:662 msgid "Deprecated" msgstr "Úrelt" -#: core/models.py:785 wasa2il/templates/core/election_detail.html:82 +#: core/models.py:800 wasa2il/templates/core/election_detail.html:93 msgid "Voting system" msgstr "Kosningakerfi" -#: core/models.py:786 wasa2il/templates/core/election_detail.html:72 +#: core/models.py:801 wasa2il/templates/core/election_detail.html:74 #: wasa2il/templates/core/election_list.html:19 msgid "Deadline for candidacy" msgstr "Tímamörk fyrir framboð" -#: core/models.py:787 +#: core/models.py:802 msgid "Start time for votes" msgstr "Upphaf kosninga" -#: core/models.py:788 wasa2il/templates/core/election_detail.html:73 +#: core/models.py:803 wasa2il/templates/core/election_detail.html:75 #: wasa2il/templates/core/election_list.html:20 #: wasa2il/templates/core/issue_detail.html:36 msgid "Deadline for votes" msgstr "Tímamörk fyrir atkvæði" -#: core/models.py:799 +#: core/models.py:814 wasa2il/templates/core/election_detail.html:77 msgid "Membership deadline" msgstr "Skráningarmörk kjósenda" -#: core/models.py:802 wasa2il/templates/base.html:128 +#: core/models.py:817 wasa2il/templates/base.html:142 msgid "Instructions" msgstr "Leiðbeiningar" -#: core/views.py:417 +#: core/views.py:423 msgid "voting" msgstr "atkvæðagreiðsla" -#: local/env/lib/python2.7/site-packages/django/contrib/messages/apps.py:7 -#: wasa2il/templates/forum/forum_detail.html:19 -msgid "Messages" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/contrib/sitemaps/apps.py:7 -msgid "Site Maps" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/contrib/staticfiles/apps.py:7 -msgid "Static Files" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/contrib/syndication/apps.py:7 -msgid "Syndication" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/contrib/webdesign/apps.py:7 -msgid "Web Design" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:20 -msgid "Enter a valid value." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:94 -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:712 -msgid "Enter a valid URL." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:137 -msgid "Enter a valid integer." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:148 -msgid "Enter a valid email address." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:222 -msgid "" -"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:227 -#: local/env/lib/python2.7/site-packages/django/core/validators.py:246 -msgid "Enter a valid IPv4 address." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:232 -#: local/env/lib/python2.7/site-packages/django/core/validators.py:247 -msgid "Enter a valid IPv6 address." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:242 -#: local/env/lib/python2.7/site-packages/django/core/validators.py:245 -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:270 -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1144 -msgid "Enter only digits separated by commas." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:279 -#, python-format -msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:305 -#, python-format -msgid "Ensure this value is less than or equal to %(limit_value)s." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:312 -#, python-format -msgid "Ensure this value is greater than or equal to %(limit_value)s." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:321 -#, python-format -msgid "" -"Ensure this value has at least %(limit_value)d character (it has " -"%(show_value)d)." -msgid_plural "" -"Ensure this value has at least %(limit_value)d characters (it has " -"%(show_value)d)." -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/core/validators.py:332 -#, python-format -msgid "" -"Ensure this value has at most %(limit_value)d character (it has " -"%(show_value)d)." -msgid_plural "" -"Ensure this value has at most %(limit_value)d characters (it has " -"%(show_value)d)." -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/db/models/base.py:1130 -#: local/env/lib/python2.7/site-packages/django/forms/models.py:718 -msgid "and" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/base.py:1132 -#, python-format -msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:107 -#, python-format -msgid "Value %(value)r is not a valid choice." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:108 -msgid "This field cannot be null." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:109 -msgid "This field cannot be blank." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:110 -#, python-format -msgid "%(model_name)s with this %(field_label)s already exists." -msgstr "" - -#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. -#. Eg: "Title must be unique for pub_date year" -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:114 -#, python-format -msgid "" -"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:132 -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:922 -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1832 -msgid "Integer" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:926 -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1830 -#, python-format -msgid "'%(value)s' value must be an integer." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1001 -#, python-format -msgid "'%(value)s' value must be either True or False." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1003 -msgid "Boolean (Either True or False)" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1078 -#, python-format -msgid "String (up to %(max_length)s)" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1139 -msgid "Comma-separated integers" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1188 -#, python-format -msgid "" -"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " -"format." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1190 -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1340 -#, python-format -msgid "" -"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " -"date." +#: wasa2il/templates/403.html:5 +msgid "403 Access Denied" msgstr "" -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1193 -msgid "Date (without time)" +#: wasa2il/templates/404.html:5 +msgid "404 File Not Found" msgstr "" -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1338 -#, python-format -msgid "" -"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." -"uuuuuu]][TZ] format." -msgstr "" +#: wasa2il/templates/500.html:7 +msgid "Something bad happened!" +msgstr "Eitthvað slæmt gerðist!" -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1342 -#, python-format +#: wasa2il/templates/500.html:9 msgid "" -"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ]) but it is an invalid date/time." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1346 -msgid "Date (with time)" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1498 -#, python-format -msgid "'%(value)s' value must be a decimal number." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1500 -msgid "Decimal number" +"A bunch of well-trained monkeys have been notified and they will take a " +"look at the problem as soon as possible." msgstr "" +"Hópur vel þjálfaðra apa hefur verið látinn vita og mun líta á vandann " +"eins fljótt og auðið er." -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1651 -#, python-format +#: wasa2il/templates/500.html:11 msgid "" -"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." -"uuuuuu] format." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1654 -msgid "Duration" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1705 -msgid "Email address" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1729 -msgid "File path" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1796 -#, python-format -msgid "'%(value)s' value must be a float." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1798 -msgid "Floating point number" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1899 -msgid "Big (8 byte) integer" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1914 -msgid "IPv4 address" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:1950 -msgid "IP address" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2029 -#, python-format -msgid "'%(value)s' value must be either None, True or False." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2031 -msgid "Boolean (Either True, False or None)" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2091 -msgid "Positive integer" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2103 -msgid "Positive small integer" +"Sometimes things break only for a few seconds, so it may work if you try " +"again." msgstr "" +"Stundum bila hlutirnir bara í nokkrar sekúndur þannig að það gæti virkað " +"að reyna aftur." -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2116 -#, python-format -msgid "Slug (up to %(max_length)s)" -msgstr "" +#: wasa2il/templates/500.html:13 +msgid "Otherwise, please email us at" +msgstr "Ef ekki, vinsamlegast sendið okkur póst á netfangið" -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2145 -msgid "Small integer" -msgstr "" +#: wasa2il/templates/base.html:8 +msgid "Voting System - Pirate Party Iceland" +msgstr "Kosningakerfi Pírata" -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2152 -#: wasa2il/templates/core/stub/document_view.html:84 -msgid "Text" +#: wasa2il/templates/base.html:91 wasa2il/templates/core/issue_detail.html:78 +msgid "There was an error while processing your vote. Please try again." msgstr "" +"Það kom upp villa við úrvinnslu atkvæðisins þíns. Vinsamlegast reyndu " +"aftur." -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2175 -#, python-format -msgid "" -"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " -"format." -msgstr "" +#: wasa2il/templates/base.html:94 +msgid "Your votes have been submitted!" +msgstr "Atkvæði þitt hefur verið móttekið!" -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2177 -#, python-format +#: wasa2il/templates/base.html:95 msgid "" -"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " -"invalid time." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2180 -msgid "Time" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2308 -msgid "URL" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2331 -msgid "Raw binary data" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/__init__.py:2375 -#, python-format -msgid "'%(value)s' is not a valid UUID." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/files.py:238 -msgid "File" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/files.py:388 -msgid "Image" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/db/models/fields/related.py:1809 -#, python-format -msgid "%(model)s instance with %(field)s %(value)r does not exist." +"You can continue adding, removing or reordering candidates until the " +"deadline." msgstr "" +"Þú getur haldið áfram að bæta við, fjarlægja eða umraða frambjóðendum þar" +" til fresturinn rennur út." -#: local/env/lib/python2.7/site-packages/django/db/models/fields/related.py:1811 -msgid "Foreign Key (type determined by related field)" -msgstr "" +#: wasa2il/templates/base.html:98 +#: wasa2il/templates/core/election_detail.html:175 +msgid "Working..." +msgstr "Sendi gögn..." -#: local/env/lib/python2.7/site-packages/django/db/models/fields/related.py:2041 -msgid "One-to-one relationship" -msgstr "" +#: wasa2il/templates/base.html:107 wasa2il/templates/help/is/agreement.html:6 +#: wasa2il/templates/help/is/authors.html:6 +#: wasa2il/templates/help/is/copyright.html:6 +#: wasa2il/templates/help/is/index.html:6 +#: wasa2il/templates/help/is/polity.html:6 +#: wasa2il/templates/help/is/proposal.html:6 +#: wasa2il/templates/help/is/wasa2il.html:6 +msgid "Help" +msgstr "Hjálp" -#: local/env/lib/python2.7/site-packages/django/db/models/fields/related.py:2131 -msgid "Many-to-many relationship" -msgstr "" +#: wasa2il/templates/base.html:113 +msgid "My profile" +msgstr "Mín síða" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:64 -msgid "This field is required." -msgstr "" +#: wasa2il/templates/base.html:114 +msgid "My settings" +msgstr "Stillingar" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:237 -msgid "Enter a whole number." -msgstr "" +#: wasa2il/templates/base.html:116 +#: wasa2il/templates/registration/verification_needed.html:12 +msgid "Logout" +msgstr "Útskrá" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:280 -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:317 -msgid "Enter a number." -msgstr "" +#: wasa2il/templates/base.html:120 wasa2il/templates/entry.html:17 +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/password_reset_complete.html:9 +msgid "Log in" +msgstr "Innskrá" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:319 -#, python-format -msgid "Ensure that there are no more than %(max)s digit in total." -msgid_plural "Ensure that there are no more than %(max)s digits in total." -msgstr[0] "" -msgstr[1] "" +#: wasa2il/templates/base.html:121 wasa2il/templates/entry.html:11 +#: wasa2il/templates/registration/login.html:23 +#: wasa2il/templates/registration/registration_form.html:6 +#: wasa2il/templates/registration/registration_form.html:26 +msgid "Sign up" +msgstr "Nýskrá" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:323 -#, python-format -msgid "Ensure that there are no more than %(max)s decimal place." -msgid_plural "Ensure that there are no more than %(max)s decimal places." -msgstr[0] "" -msgstr[1] "" +#: wasa2il/templates/base.html:127 +msgid "Search agreements" +msgstr "Leita í samþykktum" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:327 -#, python-format -msgid "" -"Ensure that there are no more than %(max)s digit before the decimal point." -msgid_plural "" -"Ensure that there are no more than %(max)s digits before the decimal point." -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:438 -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:1193 -msgid "Enter a valid date." -msgstr "" +#: wasa2il/templates/base.html:139 +msgid "Back to top" +msgstr "Fara efst" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:462 -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:1194 -msgid "Enter a valid time." -msgstr "" +#: wasa2il/templates/base.html:140 +msgid "About wasa2il" +msgstr "Um wasa2il" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:484 -msgid "Enter a valid date/time." -msgstr "" +#: wasa2il/templates/base.html:141 +msgid "License" +msgstr "Notandaleyfi" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:525 -msgid "Enter a valid duration." -msgstr "" +#: wasa2il/templates/base.html:143 wasa2il/templates/help/is/authors.html:6 +msgid "Authors" +msgstr "Höfundar" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:591 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "" +#: wasa2il/templates/entry.html:12 +msgid "In order to use Wasa2il you need to register an account." +msgstr "Til að nota Wasa2il þarftu að skrá notandaaðgang." -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:592 -msgid "No file was submitted." -msgstr "" +#: wasa2il/templates/entry.html:18 +msgid "If you log in, you can participate in your polities." +msgstr "Ef þú skráir þig inn þá getur þú tekið þátt í þínum þingum." -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:593 -msgid "The submitted file is empty." -msgstr "" +#: wasa2il/templates/entry.html:23 +msgid "Browse Polities" +msgstr "Skoða þing" -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:595 -#, python-format -msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." -msgid_plural "" -"Ensure this filename has at most %(max)d characters (it has %(length)d)." -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:598 -msgid "Please either submit a file or check the clear checkbox, not both." -msgstr "" +#: wasa2il/templates/entry.html:24 +msgid "You can browse publicly visible polities without registering." +msgstr "Þú getur skoðað þing, sem eru opin öllum án þess að skrá þig inn." -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:660 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:827 -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:921 -#: local/env/lib/python2.7/site-packages/django/forms/models.py:1238 -#, python-format -msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:922 -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:1037 -#: local/env/lib/python2.7/site-packages/django/forms/models.py:1237 -msgid "Enter a list of values." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:1038 -msgid "Enter a complete value." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/fields.py:1264 -msgid "Enter a valid UUID." -msgstr "" - -#. Translators: This is the default suffix added to form field labels -#: local/env/lib/python2.7/site-packages/django/forms/forms.py:129 -msgid ":" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/forms.py:214 -#, python-format -msgid "(Hidden field %(name)s) %(error)s" -msgstr "" - -#. Translators: If found as last label character, these punctuation -#. characters will prevent the default label_suffix to be appended to the label -#: local/env/lib/python2.7/site-packages/django/forms/forms.py:659 -msgid ":?.!" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/formsets.py:96 -msgid "ManagementForm data is missing or has been tampered with" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/formsets.py:333 -#, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/forms/formsets.py:340 -#, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/forms/formsets.py:368 -#: local/env/lib/python2.7/site-packages/django/forms/formsets.py:370 -msgid "Order" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/formsets.py:372 -msgid "Delete" -msgstr "Eyða" - -#: local/env/lib/python2.7/site-packages/django/forms/models.py:712 -#, python-format -msgid "Please correct the duplicate data for %(field)s." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/models.py:716 -#, python-format -msgid "Please correct the duplicate data for %(field)s, which must be unique." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/models.py:722 -#, python-format -msgid "" -"Please correct the duplicate data for %(field_name)s which must be unique " -"for the %(lookup)s in %(date_field)s." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/models.py:730 -msgid "Please correct the duplicate values below." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/models.py:1053 -msgid "The inline foreign key did not match the parent instance primary key." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/models.py:1123 -msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/models.py:1240 -#, python-format -msgid "\"%(pk)s\" is not a valid value for a primary key." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/utils.py:165 -#, python-format -msgid "" -"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " -"may be ambiguous or it may not exist." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/widgets.py:345 -msgid "Currently" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/widgets.py:346 -msgid "Change" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/widgets.py:347 -msgid "Clear" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/widgets.py:555 -msgid "Unknown" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/forms/widgets.py:556 -#: wasa2il/templates/core/_document_agreement_list_table.html:5 -#: wasa2il/templates/core/issue_detail.html:44 -#: wasa2il/templates/core/issue_detail.html:80 -msgid "Yes" -msgstr "Já" - -#: local/env/lib/python2.7/site-packages/django/forms/widgets.py:557 -#: wasa2il/templates/core/_document_agreement_list_table.html:6 -#: wasa2il/templates/core/issue_detail.html:45 -#: wasa2il/templates/core/issue_detail.html:82 -msgid "No" -msgstr "Nei" - -#: local/env/lib/python2.7/site-packages/django/template/defaultfilters.py:865 -msgid "yes,no,maybe" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/template/defaultfilters.py:894 -#: local/env/lib/python2.7/site-packages/django/template/defaultfilters.py:906 -#, python-format -msgid "%(size)d byte" -msgid_plural "%(size)d bytes" -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/template/defaultfilters.py:908 -#, python-format -msgid "%s KB" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/template/defaultfilters.py:910 -#, python-format -msgid "%s MB" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/template/defaultfilters.py:912 -#, python-format -msgid "%s GB" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/template/defaultfilters.py:914 -#, python-format -msgid "%s TB" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/template/defaultfilters.py:916 -#, python-format -msgid "%s PB" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dateformat.py:61 -msgid "p.m." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dateformat.py:62 -msgid "a.m." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dateformat.py:67 -msgid "PM" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dateformat.py:68 -msgid "AM" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dateformat.py:153 -msgid "midnight" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dateformat.py:155 -msgid "noon" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:6 -msgid "Monday" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:6 -msgid "Tuesday" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:6 -msgid "Wednesday" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:6 -msgid "Thursday" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:6 -msgid "Friday" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:7 -msgid "Saturday" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:7 -msgid "Sunday" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:10 -msgid "Mon" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:10 -msgid "Tue" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:10 -msgid "Wed" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:10 -msgid "Thu" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:10 -msgid "Fri" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:11 -msgid "Sat" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:11 -msgid "Sun" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:18 -msgid "January" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:18 -msgid "February" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:18 -msgid "March" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:18 -msgid "April" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:18 -msgid "May" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:18 -msgid "June" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:19 -msgid "July" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:19 -msgid "August" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:19 -msgid "September" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:19 -msgid "October" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:19 -msgid "November" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:20 -msgid "December" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:23 -msgid "jan" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:23 -msgid "feb" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:23 -msgid "mar" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:23 -msgid "apr" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:23 -msgid "may" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:23 -msgid "jun" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:24 -msgid "jul" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:24 -msgid "aug" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:24 -msgid "sep" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:24 -msgid "oct" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:24 -msgid "nov" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:24 -msgid "dec" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:31 -msgctxt "abbrev. month" -msgid "Jan." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:32 -msgctxt "abbrev. month" -msgid "Feb." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:33 -msgctxt "abbrev. month" -msgid "March" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:34 -msgctxt "abbrev. month" -msgid "April" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:35 -msgctxt "abbrev. month" -msgid "May" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:36 -msgctxt "abbrev. month" -msgid "June" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:37 -msgctxt "abbrev. month" -msgid "July" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:38 -msgctxt "abbrev. month" -msgid "Aug." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:39 -msgctxt "abbrev. month" -msgid "Sept." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:40 -msgctxt "abbrev. month" -msgid "Oct." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:41 -msgctxt "abbrev. month" -msgid "Nov." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:42 -msgctxt "abbrev. month" -msgid "Dec." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:45 -msgctxt "alt. month" -msgid "January" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:46 -msgctxt "alt. month" -msgid "February" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:47 -msgctxt "alt. month" -msgid "March" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:48 -msgctxt "alt. month" -msgid "April" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:49 -msgctxt "alt. month" -msgid "May" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:50 -msgctxt "alt. month" -msgid "June" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:51 -msgctxt "alt. month" -msgid "July" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:52 -msgctxt "alt. month" -msgid "August" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:53 -msgctxt "alt. month" -msgid "September" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:54 -msgctxt "alt. month" -msgid "October" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:55 -msgctxt "alt. month" -msgid "November" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/dates.py:56 -msgctxt "alt. month" -msgid "December" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/ipv6.py:10 -msgid "This is not a valid IPv6 address." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/text.py:79 -#, python-format -msgctxt "String to return when truncating text" -msgid "%(truncated_text)s..." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/text.py:248 -msgid "or" -msgstr "" - -#. Translators: This string is used as a separator between list elements -#: local/env/lib/python2.7/site-packages/django/utils/text.py:267 -#: local/env/lib/python2.7/site-packages/django/utils/timesince.py:58 -msgid ", " -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/utils/timesince.py:10 -#, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/utils/timesince.py:11 -#, python-format -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/utils/timesince.py:12 -#, python-format -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/utils/timesince.py:13 -#, python-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/utils/timesince.py:14 -#, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/utils/timesince.py:15 -#, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" - -#: local/env/lib/python2.7/site-packages/django/utils/timesince.py:47 -msgid "0 minutes" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/csrf.py:107 -msgid "Forbidden" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/csrf.py:108 -msgid "CSRF verification failed. Request aborted." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/csrf.py:112 -msgid "" -"You are seeing this message because this HTTPS site requires a 'Referer " -"header' to be sent by your Web browser, but none was sent. This header is " -"required for security reasons, to ensure that your browser is not being " -"hijacked by third parties." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/csrf.py:117 -msgid "" -"If you have configured your browser to disable 'Referer' headers, please re-" -"enable them, at least for this site, or for HTTPS connections, or for 'same-" -"origin' requests." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/csrf.py:122 -msgid "" -"You are seeing this message because this site requires a CSRF cookie when " -"submitting forms. This cookie is required for security reasons, to ensure " -"that your browser is not being hijacked by third parties." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/csrf.py:127 -msgid "" -"If you have configured your browser to disable cookies, please re-enable " -"them, at least for this site, or for 'same-origin' requests." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/csrf.py:132 -msgid "More information is available with DEBUG=True." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/debug.py:583 -msgid "Welcome to Django" -msgstr "Velkomin í Wasa2il!" - -#: local/env/lib/python2.7/site-packages/django/views/debug.py:584 -msgid "It worked!" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/debug.py:585 -msgid "Congratulations on your first Django-powered page." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/debug.py:586 -msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/debug.py:588 -msgid "" -"You're seeing this message because you have DEBUG = True in " -"your Django settings file and you haven't configured any URLs. Get to work!" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/dates.py:48 -msgid "No year specified" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/dates.py:104 -msgid "No month specified" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/dates.py:163 -msgid "No day specified" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/dates.py:219 -msgid "No week specified" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/dates.py:378 -#: local/env/lib/python2.7/site-packages/django/views/generic/dates.py:406 -#, python-format -msgid "No %(verbose_name_plural)s available" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/dates.py:660 -#, python-format -msgid "" -"Future %(verbose_name_plural)s not available because %(class_name)s." -"allow_future is False." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/dates.py:694 -#, python-format -msgid "Invalid date string '%(datestr)s' given format '%(format)s'" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/detail.py:55 -#, python-format -msgid "No %(verbose_name)s found matching the query" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/list.py:76 -msgid "Page is not 'last', nor can it be converted to an int." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/list.py:81 -#, python-format -msgid "Invalid page (%(page_number)s): %(message)s" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/generic/list.py:172 -#, python-format -msgid "Empty list and '%(class_name)s.allow_empty' is False." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/static.py:58 -msgid "Directory indexes are not allowed here." -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/static.py:60 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "" - -#: local/env/lib/python2.7/site-packages/django/views/static.py:100 -#, python-format -msgid "Index of %(directory)s" -msgstr "" - -#: wasa2il/templates/403.html:5 -msgid "403 Access Denied" -msgstr "" - -#: wasa2il/templates/404.html:5 -msgid "404 File Not Found" -msgstr "" - -#: wasa2il/templates/500.html:7 -msgid "Something bad happened!" -msgstr "Eitthvað slæmt gerðist!" - -#: wasa2il/templates/500.html:9 -msgid "" -"A bunch of well-trained monkeys have been notified and they will take a look " -"at the problem as soon as possible." -msgstr "" -"Hópur vel þjálfaðra apa hefur verið látinn vita og mun líta á vandann eins " -"fljótt og auðið er." - -#: wasa2il/templates/500.html:11 -msgid "" -"Sometimes things break only for a few seconds, so it may work if you try " -"again." -msgstr "" -"Stundum bila hlutirnir bara í nokkrar sekúndur þannig að það gæti virkað að " -"reyna aftur." - -#: wasa2il/templates/500.html:13 -msgid "Otherwise, please email us at" -msgstr "Ef ekki, vinsamlegast sendið okkur póst á netfangið" - -#: wasa2il/templates/base.html:8 -msgid "Voting System - Pirate Party Iceland" -msgstr "Kosningakerfi Pírata" - -#: wasa2il/templates/base.html:93 wasa2il/templates/help/is/agreement.html:6 -#: wasa2il/templates/help/is/authors.html:6 -#: wasa2il/templates/help/is/copyright.html:6 -#: wasa2il/templates/help/is/index.html:6 -#: wasa2il/templates/help/is/polity.html:6 -#: wasa2il/templates/help/is/proposal.html:6 -#: wasa2il/templates/help/is/wasa2il.html:6 -msgid "Help" -msgstr "Hjálp" - -#: wasa2il/templates/base.html:99 -msgid "My profile" -msgstr "Mín síða" - -#: wasa2il/templates/base.html:100 -msgid "My settings" -msgstr "Stillingar" - -#: wasa2il/templates/base.html:102 -#: wasa2il/templates/registration/verification_needed.html:12 -msgid "Logout" -msgstr "Útskrá" +#: wasa2il/templates/profile.html:19 +msgid "Summary" +msgstr "Yfirlit" -#: wasa2il/templates/base.html:106 wasa2il/templates/entry.html:17 -#: wasa2il/templates/registration/login.html:6 -#: wasa2il/templates/registration/password_reset_complete.html:9 -msgid "Log in" -msgstr "Innskrá" +#: wasa2il/templates/profile.html:39 +msgid "This user hasn't provided a biography." +msgstr "Þessi notandi hefur ekki skrifað lýsingu á sjálfum sér." -#: wasa2il/templates/base.html:107 wasa2il/templates/entry.html:11 -#: wasa2il/templates/registration/login.html:19 -#: wasa2il/templates/registration/registration_form.html:6 -#: wasa2il/templates/registration/registration_form.html:17 -msgid "Sign up" -msgstr "Nýskrá" +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +#: wasa2il/templates/profile.html:55 +msgid "Version" +msgstr "Útgáfa" -#: wasa2il/templates/base.html:113 -msgid "Search agreements" -msgstr "Leita í samþykktum" +#: wasa2il/templates/core/document_list.html:10 +#: wasa2il/templates/core/polity_list.html:18 wasa2il/templates/search.html:6 +msgid "Documents" +msgstr "Skjöl" -#: wasa2il/templates/base.html:125 -msgid "Back to top" -msgstr "Fara efst" +#: wasa2il/templates/registration/password_change_done.html:7 +#: wasa2il/templates/registration/password_change_form.html:7 +#: wasa2il/templates/settings.html:8 +msgid "Change password" +msgstr "Breyta lykilorði" -#: wasa2il/templates/base.html:126 -msgid "About wasa2il" -msgstr "Um wasa2il" +#: wasa2il/templates/settings.html:9 +msgid "Settings" +msgstr "Stillingar" -#: wasa2il/templates/base.html:127 -msgid "License" -msgstr "Notandaleyfi" +#: wasa2il/templates/settings.html:10 +msgid "You are signed in as" +msgstr "Þú ert innskráð(ur) sem" -#: wasa2il/templates/base.html:129 wasa2il/templates/help/is/authors.html:6 -msgid "Authors" -msgstr "Höfundar" +#: wasa2il/templates/core/document_form.html:18 +#: wasa2il/templates/core/document_update.html:121 +#: wasa2il/templates/core/election_form.html:35 +#: wasa2il/templates/core/issue_form.html:30 +#: wasa2il/templates/core/polity_form.html:13 +#: wasa2il/templates/core/topic_form.html:14 +#: wasa2il/templates/forum/discussion_form.html:16 +#: wasa2il/templates/forum/forum_form.html:17 +#: wasa2il/templates/registration/password_change_form.html:21 +#: wasa2il/templates/registration/password_reset_confirm.html:13 +#: wasa2il/templates/settings.html:19 +msgid "Save" +msgstr "Vista" #: wasa2il/templates/core/_delegations_table.html:4 msgid "Type" @@ -1416,6 +412,18 @@ msgstr "" msgid "Document" msgstr "Skjal" +#: wasa2il/templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/issue_detail.html:44 +#: wasa2il/templates/core/issue_detail.html:80 +msgid "Yes" +msgstr "Já" + +#: wasa2il/templates/core/_document_agreement_list_table.html:6 +#: wasa2il/templates/core/issue_detail.html:45 +#: wasa2il/templates/core/issue_detail.html:82 +msgid "No" +msgstr "Nei" + #: wasa2il/templates/core/_document_agreement_list_table.html:7 #: wasa2il/templates/core/issue_detail.html:81 msgid "Abstain" @@ -1425,14 +433,6 @@ msgstr "Sitja hjá" msgid "Adopted" msgstr "Samþykkt" -#: wasa2il/templates/core/_document_agreement_list_table.html:27 -msgid "No elections are scheduled at the moment." -msgstr "Engar kosningar eru á dagskrá í augnablikinu." - -#: wasa2il/templates/core/_document_agreement_list_table.html:27 -msgid "There are no new issues at the moment." -msgstr "Engin nýleg mál eru til umræðu í augnabliknu." - #: wasa2il/templates/core/_document_agreement_list_table.html:27 msgid "This polity has no agreements." msgstr "Þetta þing hefur engar samþykktir." @@ -1483,7 +483,7 @@ msgid "Statements:" msgstr "Statements:" #: wasa2il/templates/core/_document_modal.html:49 -#: wasa2il/templates/core/polity_detail.html:170 +#: wasa2il/templates/core/polity_detail.html:148 #: wasa2il/templates/core/topic_detail.html:72 #: wasa2il/templates/forum/forum_detail.html:48 msgid "Close" @@ -1519,19 +519,19 @@ msgstr "Samþykkt skjöl" msgid "Vote" msgstr "Kjósa" -#: wasa2il/templates/core/_election_candidate_list.html:33 +#: wasa2il/templates/core/_election_candidate_list.html:34 msgid "Your ballot is empty." msgstr "Kjörseðillinn er tómur." -#: wasa2il/templates/core/_election_candidate_list.html:34 +#: wasa2il/templates/core/_election_candidate_list.html:35 msgid "Drag candidates here or click the vote buttons." msgstr "Dragðu frambjóðendur hingað eða smelltu á takka til að kjósa." -#: wasa2il/templates/core/_election_candidate_list.html:36 +#: wasa2il/templates/core/_election_candidate_list.html:38 msgid "You have selected all the candidates, good work!" msgstr "Þú hefur raðað öllum á seðilinn, vel gert!" -#: wasa2il/templates/core/_election_candidate_list.html:36 +#: wasa2il/templates/core/_election_candidate_list.html:40 msgid "There are no candidates standing in this election yet!" msgstr "Þessar kosningar hafa enga frambjóðendur enn sem komið er." @@ -1546,7 +546,7 @@ msgstr "Þú hefur ekki greitt atkvæði um þetta mál" #: wasa2il/templates/core/_election_list_table.html:11 #: wasa2il/templates/core/election_list.html:25 #: wasa2il/templates/core/issues_new.html:32 -#: wasa2il/templates/core/polity_detail.html:60 +#: wasa2il/templates/core/polity_detail.html:61 #: wasa2il/templates/core/topic_detail.html:34 msgid "Voting" msgstr "Í kosningu" @@ -1554,7 +554,7 @@ msgstr "Í kosningu" #: wasa2il/templates/core/_election_list_table.html:11 #: wasa2il/templates/core/election_list.html:25 #: wasa2il/templates/core/issues_new.html:32 -#: wasa2il/templates/core/polity_detail.html:60 +#: wasa2il/templates/core/polity_detail.html:61 #: wasa2il/templates/core/topic_detail.html:34 msgid "Open" msgstr "Opið" @@ -1565,6 +565,67 @@ msgstr "Opið" msgid "Closed" msgstr "Lokað" +#: wasa2il/templates/core/_election_list_table.html:18 +msgid "No elections are scheduled at the moment." +msgstr "Engar kosningar eru á dagskrá í augnablikinu." + +#: wasa2il/templates/core/_polity_detail_elections.html:8 +#: wasa2il/templates/core/election_form.html:28 +msgid "New election" +msgstr "Ný kosning" + +#: wasa2il/templates/core/_polity_detail_elections.html:13 +msgid "Show closed elections" +msgstr "Sýna liðnar kosningar" + +#: wasa2il/templates/core/_polity_detail_elections.html:14 +msgid "Show all elections" +msgstr "Sýna allar kosningar" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +#: wasa2il/templates/core/polity_detail.html:25 +msgid "Elections" +msgstr "Kosningar" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +msgid "putting people in power" +msgstr "gefa fólki völd" + +#: wasa2il/templates/core/_polity_detail_elections.html:20 +msgid "Sometimes you need to put people in their places. Elections do just that." +msgstr "Stundum þarf að setja fólk á sinn stað. Kosningar gera einmitt það." + +#: wasa2il/templates/core/_polity_detail_elections.html:25 +#: wasa2il/templates/core/election_list.html:15 +msgid "Election" +msgstr "Kosning" + +#: wasa2il/templates/core/_polity_detail_elections.html:26 +#: wasa2il/templates/core/election_list.html:16 +#: wasa2il/templates/core/issues_new.html:19 +#: wasa2il/templates/core/polity_detail.html:48 +#: wasa2il/templates/core/topic_detail.html:22 +msgid "State" +msgstr "Ástand" + +#: wasa2il/templates/core/_polity_detail_elections.html:27 +#: wasa2il/templates/core/election_detail.html:91 +#: wasa2il/templates/core/election_detail.html:172 +#: wasa2il/templates/core/election_list.html:17 +msgid "Candidates" +msgstr "Frambjóðendur" + +#: wasa2il/templates/core/_polity_detail_elections.html:28 +#: wasa2il/templates/core/election_detail.html:89 +#: wasa2il/templates/core/election_detail.html:148 +#: wasa2il/templates/core/election_list.html:18 +#: wasa2il/templates/core/issue_detail.html:42 +#: wasa2il/templates/core/issues_new.html:21 +#: wasa2il/templates/core/polity_detail.html:50 +#: wasa2il/templates/core/topic_detail.html:24 +msgid "Votes" +msgstr "Atkvæði" + #: wasa2il/templates/core/_topic_list_table.html:19 msgid "There are no topics in this polity!" msgstr "Það eru engir málaflokkar á þessu þingi!" @@ -1575,7 +636,7 @@ msgstr "Stofna nýjan málaflokk" #: wasa2il/templates/core/delegate_detail.html:6 #: wasa2il/templates/core/document_detail.html:14 -#: wasa2il/templates/core/election_detail.html:29 +#: wasa2il/templates/core/election_detail.html:31 #: wasa2il/templates/core/election_list.html:8 #: wasa2il/templates/core/issue_detail.html:6 #: wasa2il/templates/core/issues_new.html:8 @@ -1649,30 +710,11 @@ msgstr "Nýtt skjal" msgid "In polity:" msgstr "Í þingi:" -#: wasa2il/templates/core/document_form.html:18 -#: wasa2il/templates/core/document_update.html:121 -#: wasa2il/templates/core/election_form.html:35 -#: wasa2il/templates/core/issue_form.html:30 -#: wasa2il/templates/core/polity_form.html:13 -#: wasa2il/templates/core/topic_form.html:14 -#: wasa2il/templates/forum/discussion_form.html:16 -#: wasa2il/templates/forum/forum_form.html:17 -#: wasa2il/templates/registration/password_change_form.html:21 -#: wasa2il/templates/registration/password_reset_confirm.html:14 -#: wasa2il/templates/settings.html:19 -msgid "Save" -msgstr "Vista" - #: wasa2il/templates/core/document_list.html:7 -#: wasa2il/templates/core/polity_detail.html:72 +#: wasa2il/templates/core/polity_detail.html:83 msgid "New document" msgstr "Nýtt skjal" -#: wasa2il/templates/core/document_list.html:10 -#: wasa2il/templates/core/polity_list.html:18 wasa2il/templates/search.html:6 -msgid "Documents" -msgstr "Skjöl" - #: wasa2il/templates/core/document_update.html:15 msgid "Change proposal must differ from its predecessor." msgstr "Breytingatillaga verður að vera öðruvísi en upprunatexti." @@ -1689,7 +731,7 @@ msgstr "Tillaga" #: wasa2il/templates/core/document_update.html:115 #: wasa2il/templates/core/document_update.html:192 #: wasa2il/templates/core/issues_new.html:20 -#: wasa2il/templates/core/polity_detail.html:48 +#: wasa2il/templates/core/polity_detail.html:49 #: wasa2il/templates/core/topic_detail.html:23 msgid "Comments" msgstr "Ummæli" @@ -1746,197 +788,139 @@ msgstr "Höfundur" msgid "New draft" msgstr "Ný drög" -#: wasa2il/templates/core/election_detail.html:31 +#: wasa2il/templates/core/election_detail.html:33 msgid "Election:" msgstr "Kosning:" -#: wasa2il/templates/core/election_detail.html:34 +#: wasa2il/templates/core/election_detail.html:36 msgid "This election is closed." msgstr "Þessu máli er lokið." -#: wasa2il/templates/core/election_detail.html:37 +#: wasa2il/templates/core/election_detail.html:39 msgid "You cannot vote in this election:" msgstr "Þú getur ekki kosið í þessum kosningum:" -#: wasa2il/templates/core/election_detail.html:39 -#: wasa2il/templates/core/election_detail.html:52 +#: wasa2il/templates/core/election_detail.html:41 +#: wasa2il/templates/core/election_detail.html:54 msgid "Please log in." msgstr "Vinsamlegast skráðu þig inn." -#: wasa2il/templates/core/election_detail.html:41 +#: wasa2il/templates/core/election_detail.html:43 msgid "You joined the organization too late." msgstr "" -#: wasa2il/templates/core/election_detail.html:43 -#: wasa2il/templates/core/election_detail.html:54 +#: wasa2il/templates/core/election_detail.html:45 +#: wasa2il/templates/core/election_detail.html:56 msgid "You are not a member of this polity." msgstr "Þú ert ekki meðlimur þessa þings." -#: wasa2il/templates/core/election_detail.html:45 -#: wasa2il/templates/core/election_detail.html:56 +#: wasa2il/templates/core/election_detail.html:47 +#: wasa2il/templates/core/election_detail.html:58 msgid "You do not meet the requirements." msgstr "Þú uppfyllir ekki skilyrðin." -#: wasa2il/templates/core/election_detail.html:50 +#: wasa2il/templates/core/election_detail.html:52 msgid "You cannot run in this election:" msgstr "Þú getur ekki farið fram í þessum kosningum:" -#: wasa2il/templates/core/election_detail.html:63 +#: wasa2il/templates/core/election_detail.html:65 msgid "This election is delegated." msgstr "" -#: wasa2il/templates/core/election_detail.html:63 +#: wasa2il/templates/core/election_detail.html:65 #: wasa2il/templates/core/topic_detail.html:12 msgid "View details." msgstr "Birta smáatriði." -#: wasa2il/templates/core/election_detail.html:71 +#: wasa2il/templates/core/election_detail.html:73 msgid "Voting begins" msgstr "Kosningar hefjast" -#: wasa2il/templates/core/election_detail.html:75 +#: wasa2il/templates/core/election_detail.html:80 msgid "Candidacy polities" msgstr "Þing frambjóðenda" -#: wasa2il/templates/core/election_detail.html:78 +#: wasa2il/templates/core/election_detail.html:81 msgid "You can run" msgstr "Mátt bjóða fram" -#: wasa2il/templates/core/election_detail.html:82 +#: wasa2il/templates/core/election_detail.html:85 msgid "Voting polities" msgstr "Þing kjósenda" -#: wasa2il/templates/core/election_detail.html:83 +#: wasa2il/templates/core/election_detail.html:86 msgid "You can vote" msgstr "Mátt kjósa" -#: wasa2il/templates/core/election_detail.html:86 -#: wasa2il/templates/core/election_detail.html:145 -#: wasa2il/templates/core/election_list.html:18 -#: wasa2il/templates/core/issue_detail.html:42 -#: wasa2il/templates/core/issues_new.html:21 -#: wasa2il/templates/core/polity_detail.html:49 -#: wasa2il/templates/core/polity_detail.html:142 -#: wasa2il/templates/core/topic_detail.html:24 -msgid "Votes" -msgstr "Atkvæði" - -#: wasa2il/templates/core/election_detail.html:81 -#: wasa2il/templates/core/election_detail.html:170 -#: wasa2il/templates/core/election_list.html:17 -#: wasa2il/templates/core/polity_detail.html:141 -msgid "Candidates" -msgstr "Frambjóðendur" - -#: wasa2il/templates/core/election_detail.html:84 +#: wasa2il/templates/core/election_detail.html:95 msgid "Details ..." msgstr "Upplýsingar ..." -#: wasa2il/templates/core/election_detail.html:93 -#: wasa2il/templates/core/election_detail.html:152 +#: wasa2il/templates/core/election_detail.html:105 +#: wasa2il/templates/core/election_detail.html:154 msgid "About This Election" msgstr "Um Þessar Kosningar" -#: wasa2il/templates/core/election_detail.html:102 +#: wasa2il/templates/core/election_detail.html:114 msgid "Election results" msgstr "Niðurstöður kosningar" -#: wasa2il/templates/core/election_detail.html:118 +#: wasa2il/templates/core/election_detail.html:130 msgid "No votes were cast." msgstr "Engin atkvæði voru greidd." -#: wasa2il/templates/core/election_detail.html:122 +#: wasa2il/templates/core/election_detail.html:134 msgid "Votes are still being counted." msgstr "Enn er verið að telja atkvæðin." -#: wasa2il/templates/core/election_detail.html:136 +#: wasa2il/templates/core/election_detail.html:148 msgid "your favorites first!" msgstr "uppáhaldin þín efst!" -#: wasa2il/templates/core/election_detail.html:141 -#: wasa2il/templates/core/issue_detail.html:78 -msgid "There was an error while processing your vote. Please try again." -msgstr "" -"Það kom upp villa við úrvinnslu atkvæðisins þíns. Vinsamlegast reyndu aftur." - -#: wasa2il/templates/core/election_detail.html:144 -msgid "Your votes have been submitted!" -msgstr "Atkvæði þitt hefur verið móttekið!" - -#: wasa2il/templates/core/election_detail.html:145 -msgid "" -"You can continue adding, removing or reordering candidates until the " -"deadline." -msgstr "" -"Þú getur haldið áfram að bæta við, fjarlægja eða umraða frambjóðendum þar " -"til fresturinn rennur út." - -#: wasa2il/templates/core/election_detail.html:148 -msgid "Working..." -msgstr "Sendi gögn..." - -#: wasa2il/templates/core/election_detail.html:155 +#: wasa2il/templates/core/election_detail.html:157 msgid "How To Vote" msgstr "Hvernig Skal Kjósa" -#: wasa2il/templates/core/election_detail.html:157 +#: wasa2il/templates/core/election_detail.html:159 msgid "Click the Start Voting button to begin" msgstr "Smelltu á Opna Kjörseðil hnappinn til að byrja" -#: wasa2il/templates/core/election_detail.html:158 +#: wasa2il/templates/core/election_detail.html:160 msgid "Click a Vote button to vote for a candidate" msgstr "Smelltu á Kjósa hnapp til að kjósa frambjóðanda" -#: wasa2il/templates/core/election_detail.html:159 +#: wasa2il/templates/core/election_detail.html:161 msgid "Click the arrows to move your favorite candidates to the top" msgstr "Smelltu á örvarnar til að raða bestu frambjóðendunum í efstu sætin" -#: wasa2il/templates/core/election_detail.html:160 +#: wasa2il/templates/core/election_detail.html:162 msgid "Your vote will be counted when the deadline has passed" msgstr "Atkvæði þitt verður talið þegar fresturinn rennur út" -#: wasa2il/templates/core/election_detail.html:163 +#: wasa2il/templates/core/election_detail.html:165 msgid "Start Voting" msgstr "Opna Kjörseðil" -#: wasa2il/templates/core/election_detail.html:170 +#: wasa2il/templates/core/election_detail.html:172 msgid "running in this election" msgstr "í þessari kosningu" -#: wasa2il/templates/core/election_detail.html:172 +#: wasa2il/templates/core/election_detail.html:177 msgid "Announce candidacy" msgstr "Tilkynna framboð" -#: wasa2il/templates/core/election_detail.html:179 +#: wasa2il/templates/core/election_detail.html:180 msgid "Are you sure you want to withdraw? This can not be undone." msgstr "Ertu viss um að draga framboð þitt til baka? Það er óafturkræft." -#: wasa2il/templates/core/election_detail.html:181 +#: wasa2il/templates/core/election_detail.html:182 msgid "Withdraw candidacy" msgstr "Draga framboð til baka" -#: wasa2il/templates/core/election_form.html:28 -#: wasa2il/templates/core/polity_detail.html:122 -msgid "New election" -msgstr "Ný kosning" - #: wasa2il/templates/core/election_list.html:10 msgid "Elections in polity" msgstr "Kosningar í þingi" -#: wasa2il/templates/core/election_list.html:15 -#: wasa2il/templates/core/polity_detail.html:139 -msgid "Election" -msgstr "Kosning" - -#: wasa2il/templates/core/election_list.html:16 -#: wasa2il/templates/core/issues_new.html:19 -#: wasa2il/templates/core/polity_detail.html:47 -#: wasa2il/templates/core/polity_detail.html:140 -#: wasa2il/templates/core/topic_detail.html:22 -msgid "State" -msgstr "Ástand" - #: wasa2il/templates/core/issue_detail.html:24 msgid "In topics" msgstr "Í málaflokkum" @@ -1981,34 +965,34 @@ msgstr "Nýtt mál" #: wasa2il/templates/core/issues_new.html:10 #: wasa2il/templates/core/polity_detail.html:22 -#: wasa2il/templates/core/polity_detail.html:39 +#: wasa2il/templates/core/polity_detail.html:40 msgid "New issues" msgstr "Ný mál" #: wasa2il/templates/core/issues_new.html:10 -#: wasa2il/templates/core/polity_detail.html:39 +#: wasa2il/templates/core/polity_detail.html:40 msgid "in discussion" msgstr "til umræðu" #: wasa2il/templates/core/issues_new.html:11 -#: wasa2il/templates/core/polity_detail.html:41 +#: wasa2il/templates/core/polity_detail.html:42 msgid "These are the newest issues being discussed in this polity." msgstr "Þetta eru nýjustu málin til umræðu í þessu þingi." #: wasa2il/templates/core/issues_new.html:29 -#: wasa2il/templates/core/polity_detail.html:57 +#: wasa2il/templates/core/polity_detail.html:58 #: wasa2il/templates/core/topic_detail.html:30 msgid "You have voted on this issue" msgstr "Þú hefur greitt atkvæði í þessu máli" #: wasa2il/templates/core/issues_new.html:29 -#: wasa2il/templates/core/polity_detail.html:57 +#: wasa2il/templates/core/polity_detail.html:58 #: wasa2il/templates/core/topic_detail.html:30 msgid "You have not voted on this issue" msgstr "Þú hefur ekki greitt atkvæði í þessu máli" #: wasa2il/templates/core/issues_new.html:32 -#: wasa2il/templates/core/polity_detail.html:60 +#: wasa2il/templates/core/polity_detail.html:61 msgid "New" msgstr "" @@ -2021,76 +1005,58 @@ msgid "You are a member of this polity." msgstr "Þú ert meðlimur þessa þings." #: wasa2il/templates/core/polity_detail.html:23 -#: wasa2il/templates/core/polity_detail.html:75 +#: wasa2il/templates/core/polity_detail.html:86 #: wasa2il/templates/help/is/agreement.html:6 msgid "Agreements" msgstr "Samþykktir" -#: wasa2il/templates/core/polity_detail.html:25 -#: wasa2il/templates/core/polity_detail.html:132 -msgid "Elections" -msgstr "Kosningar" - -#: wasa2il/templates/core/polity_detail.html:35 +#: wasa2il/templates/core/polity_detail.html:36 msgid "Show all new issues" msgstr "Sýna öll ný mál" -#: wasa2il/templates/core/polity_detail.html:75 +#: wasa2il/templates/core/polity_detail.html:68 +msgid "There are no new issues at the moment." +msgstr "Engin nýleg mál eru til umræðu í augnabliknu." + +#: wasa2il/templates/core/polity_detail.html:86 msgid "of this polity" msgstr "þessa þings" -#: wasa2il/templates/core/polity_detail.html:77 +#: wasa2il/templates/core/polity_detail.html:88 msgid "Here are all of the agreements this polity has arrived at." msgstr "Hér eru allar samþykktir þessa þings." -#: wasa2il/templates/core/polity_detail.html:88 +#: wasa2il/templates/core/polity_detail.html:99 #: wasa2il/templates/core/topic_form.html:6 msgid "New topic" msgstr "Nýr málaflokkur" -#: wasa2il/templates/core/polity_detail.html:92 +#: wasa2il/templates/core/polity_detail.html:103 msgid "Show only starred topics" msgstr "Sýna bara stjörnumerkta málaflokka" -#: wasa2il/templates/core/polity_detail.html:96 +#: wasa2il/templates/core/polity_detail.html:107 msgid "of discussion" msgstr "til umræðu" -#: wasa2il/templates/core/polity_detail.html:98 +#: wasa2il/templates/core/polity_detail.html:109 msgid "Topics are thematic categories that contain specific issues." msgstr "Málaflokkar eru flokkar með þemu sem innihalda mál." -#: wasa2il/templates/core/polity_detail.html:104 +#: wasa2il/templates/core/polity_detail.html:115 #: wasa2il/templates/core/topic_detail.html:21 msgid "Issues" msgstr "Mál" -#: wasa2il/templates/core/polity_detail.html:105 +#: wasa2il/templates/core/polity_detail.html:116 msgid "Open Issues" msgstr "Opin mál" -#: wasa2il/templates/core/polity_detail.html:106 +#: wasa2il/templates/core/polity_detail.html:117 msgid "Voting Issues" msgstr "Mál í kosningu" -#: wasa2il/templates/core/polity_detail.html:127 -msgid "Show closed elections" -msgstr "Sýna liðnar kosningar" - -#: wasa2il/templates/core/polity_detail.html:128 -msgid "Show all elections" -msgstr "Sýna allar kosningar" - -#: wasa2il/templates/core/polity_detail.html:132 -msgid "putting people in power" -msgstr "gefa fólki völd" - -#: wasa2il/templates/core/polity_detail.html:134 -msgid "" -"Sometimes you need to put people in their places. Elections do just that." -msgstr "Stundum þarf að setja fólk á sinn stað. Kosningar gera einmitt það." - -#: wasa2il/templates/core/polity_detail.html:160 +#: wasa2il/templates/core/polity_detail.html:138 msgid "Subpolities" msgstr "Undirþing" @@ -2104,6 +1070,26 @@ msgstr "Nýtt þing" msgid "Polities" msgstr "Þing" +#: wasa2il/templates/core/topic_detail.html:12 +msgid "This topic is delegated." +msgstr "This topic is delegated." + +#: wasa2il/templates/core/topic_detail.html:18 +msgid "List of issues" +msgstr "Málalisti" + +#: wasa2il/templates/core/topic_detail.html:43 +msgid "New discussions" +msgstr "Nýjar umræður" + +#: wasa2il/templates/core/topic_detail.html:48 +msgid "in" +msgstr "í" + +#: wasa2il/templates/core/topic_detail.html:60 +msgid "Followers of this topic" +msgstr "Fylgjendur þessa málaflokks" + #: wasa2il/templates/core/stub/document_view.html:14 #: wasa2il/templates/core/stub/document_view.html:85 msgid "Comparison" @@ -2113,16 +1099,14 @@ msgstr "Samanburður" msgid "Comparison in progress..." msgstr "Samanburður í vinnslu..." +#: wasa2il/templates/core/stub/document_view.html:84 +msgid "Text" +msgstr "" + #: wasa2il/templates/core/stub/document_view.html:89 msgid "Compared to" msgstr "Samanborið við" -#: wasa2il/templates/core/stub/document_view.html:93 -#: wasa2il/templates/core/stub/document_view.html:95 -#: wasa2il/templates/profile.html:55 -msgid "Version" -msgstr "Útgáfa" - #: wasa2il/templates/core/stub/document_view.html:93 #: wasa2il/templates/core/stub/document_view.html:95 msgid "predecessor" @@ -2148,42 +1132,6 @@ msgstr "Tillögu þessari hefur verið hafnað með atkvæðagreiðslu." msgid "This proposal is deprecated. A newer version has taken effect." msgstr "Þessi tillaga er úreld. Nýrri útgáfa hefur tekið gildi." -#: wasa2il/templates/core/topic_detail.html:12 -msgid "This topic is delegated." -msgstr "This topic is delegated." - -#: wasa2il/templates/core/topic_detail.html:18 -msgid "List of issues" -msgstr "Málalisti" - -#: wasa2il/templates/core/topic_detail.html:43 -msgid "New discussions" -msgstr "Nýjar umræður" - -#: wasa2il/templates/core/topic_detail.html:48 -msgid "in" -msgstr "í" - -#: wasa2il/templates/core/topic_detail.html:60 -msgid "Followers of this topic" -msgstr "Fylgjendur þessa málaflokks" - -#: wasa2il/templates/entry.html:12 -msgid "In order to use Wasa2il you need to register an account." -msgstr "Til að nota Wasa2il þarftu að skrá notandaaðgang." - -#: wasa2il/templates/entry.html:18 -msgid "If you log in, you can participate in your polities." -msgstr "Ef þú skráir þig inn þá getur þú tekið þátt í þínum þingum." - -#: wasa2il/templates/entry.html:23 -msgid "Browse Polities" -msgstr "Skoða þing" - -#: wasa2il/templates/entry.html:24 -msgid "You can browse publicly visible polities without registering." -msgstr "Þú getur skoðað þing, sem eru opin öllum án þess að skrá þig inn." - #: wasa2il/templates/forum/discussion_detail.html:7 msgid "Back to forum" msgstr "" @@ -2209,6 +1157,10 @@ msgstr "" msgid "Discussions" msgstr "Umræður" +#: wasa2il/templates/forum/forum_detail.html:19 +msgid "Messages" +msgstr "" + #: wasa2il/templates/forum/forum_detail.html:20 msgid "Participants" msgstr "" @@ -2221,16 +1173,16 @@ msgstr "" msgid "Name:" msgstr "" -#: wasa2il/templates/help/is/agreement.html:8 +#: wasa2il/templates/help/is/agreement.html:61 msgid "" "\n" "

          \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

          \n" "

          \n" "There's a lot of \"generally\" in there, because different polities do " @@ -2238,73 +1190,74 @@ msgid "" "

          \n" "

          Conditions of adoption

          \n" "

          \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

          \n" -"

          More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

          More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

          \n" -"

          A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

          A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

          \n" "

          Document structure

          \n" "

          \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

          \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
          \n" "\t

          0047/2010

          \n" "\t

          Written declaration on the establishment of " "European Home-Made Ice Cream Day

          \n" "\t

          The European Parliament,

          \n" -"\t

          —   having regard to Rule 123 of " -"its Rules of Procedure,

          \n" +"\t

          —   having regard to Rule 123 " +"of its Rules of Procedure,

          \n" "\t
            \n" "\t\t
          1. whereas the quality of food is a distinctive feature of European " "products and home-made ice cream is synonymous \n" "\t\twith quality as far as fresh dairy products are concerned,
          2. \n" -"\t\t
          3. whereas in some areas home-made ice cream is a typical food product " -"in the fresh dairy \n" +"\t\t
          4. whereas in some areas home-made ice cream is a typical food " +"product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
          5. \n" -"\t\t
          6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
          7. \n" +"\t\t
          8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
          9. \n" "\t
          \n" "\t
            \n" -"\t\t
          1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\t\t
          2. Calls on the Member States to support the quality product that is" +" home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
          3. \n" -"\t\t
          4. Considers it important, to that end, to establish European Home-Made " -"Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\t\t
          5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
          6. \n" +"\t\t
          7. Considers it important, to that end, to establish European Home-" +"Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
          8. \n" +"\t\t
          9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
          10. \n" "\t
          \n" "
          \n" "

          \n" @@ -2316,10 +1269,10 @@ msgstr "Fyrirsögnin" #: wasa2il/templates/help/is/agreement.html:64 msgid "" -"Agreements may have various forms of reference. One is a reference number, " -"which should be unique and cannonical. Another is a human readable title " -"that is descriptive. Some polities might choose not to use either one, but " -"rules around this should generally be decided on." +"Agreements may have various forms of reference. One is a reference " +"number, which should be unique and cannonical. Another is a human " +"readable title that is descriptive. Some polities might choose not to use" +" either one, but rules around this should generally be decided on." msgstr "" #: wasa2il/templates/help/is/agreement.html:65 @@ -2328,8 +1281,8 @@ msgstr "Þingið" #: wasa2il/templates/help/is/agreement.html:65 msgid "" -"Many polities make sure that their agreements contain their name, so as not " -"to be confusing." +"Many polities make sure that their agreements contain their name, so as " +"not to be confusing." msgstr "" #: wasa2il/templates/help/is/agreement.html:66 @@ -2348,10 +1301,11 @@ msgstr "Forsendusvæðið" #: wasa2il/templates/help/is/agreement.html:67 msgid "" -"The assumptions section generally contains a list of assumptions that are " -"being made. Often these are factual references, or slightly more oblique " -"references to previous decisions. Sometimes they're bizzarre statements of " -"opinion, or even, if used incorrectly, declarations of their own right." +"The assumptions section generally contains a list of assumptions that are" +" being made. Often these are factual references, or slightly more oblique" +" references to previous decisions. Sometimes they're bizzarre statements " +"of opinion, or even, if used incorrectly, declarations of their own " +"right." msgstr "" #: wasa2il/templates/help/is/agreement.html:68 @@ -2360,9 +1314,9 @@ msgstr "Fullyrðingasvæðið" #: wasa2il/templates/help/is/agreement.html:68 msgid "" -"This is the meat of the agreement. It contains one or more statements which " -"are considered to be agreed upon by the polity when the document is adopted. " -"One might even call this the law." +"This is the meat of the agreement. It contains one or more statements " +"which are considered to be agreed upon by the polity when the document is" +" adopted. One might even call this the law." msgstr "" #: wasa2il/templates/help/is/agreement.html:71 @@ -2382,7 +1336,7 @@ msgstr "Hvernig leggur maður fram tillögu?" msgid "How does electronic democracy work?" msgstr "Hvernig virkar rafrænt lýðræði?" -#: wasa2il/templates/help/is/authors.html:8 +#: wasa2il/templates/help/is/authors.html:50 msgid "" "\n" "

          Developers:

          \n" @@ -2391,6 +1345,7 @@ msgid "" "
        5. Tómas Árni Jónasson
        6. \n" "
        7. Helgi Hrafn Gunnarsson
        8. \n" "
        9. Björn Leví Gunnarsson
        10. \n" +"
        11. Bjarni Rúnar Einarsson
        12. \n" "\n" "

          Contributors:

          \n" "
            \n" @@ -2399,6 +1354,10 @@ msgid "" "
          • Zineb Belmkaddem
          • \n" "
          • Þórgnýr Thoroddssen
          • \n" "
          • Stefán Vignir Skarphéðinsson
          • \n" +"
          • Jóhann Haukur Gunnarsson
          • \n" +"
          • Steinn Eldjárn Sigurðarson
          • \n" +"
          • Björgvin Ragnarsson
          • \n" +"
          • Viktor Smári
          • \n" "
          \n" "\n" "

          Translations:

          \n" @@ -2411,7 +1370,7 @@ msgid "" "\n" "

          Icelandic:

          \n" "
            \n" -"
          • Eva Þurríðardóttir
          • \n" +"
          • Eva Þuríðardóttir
          • \n" "
          • Smári McCarthy
          • \n" "
          • Tómas Árni Jónasson
          • \n" "
          \n" @@ -2427,7 +1386,7 @@ msgstr "" msgid "Copyright" msgstr "" -#: wasa2il/templates/help/is/copyright.html:8 +#: wasa2il/templates/help/is/copyright.html:10 msgid "" "\n" "This is free software, licensed under the GNU Affero General Public " @@ -2436,19 +1395,21 @@ msgstr "" #: wasa2il/templates/help/is/index.html:8 msgid "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." msgstr "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." #: wasa2il/templates/help/is/index.html:9 msgid "" -"If you ever feel like you aren't getting a good enough explanation, please " -"\n" -"Polities are groups of people who come together to make decisions and enact " -"their will.\n" -"These are given various names depending on their form, structure, intent, " -"scale and scope.\n" +"Polities are groups of people who come together to make decisions and " +"enact their will.\n" +"These are given various names depending on their form, structure, intent," +" scale and scope.\n" "Therefore they are variously called \"countries\", \"towns\", \"clubs\", " "\"cabals\", \"mafias\", \"federations\",\n" "\"treaties\", \"unions\", \"associations\", \"companies\", \"phyles\", " @@ -2491,52 +1452,54 @@ msgid "" "

          \n" "The reason we use the word \"polity\" in Wasa2il is that it is the most " "generic term we could\n" -"find. It says nothing of the form, the structure, the intent, scale or scope " -"of the group\n" +"find. It says nothing of the form, the structure, the intent, scale or " +"scope of the group\n" "of people, nor does it preclude anything. Using the word \"group\" could " "work too, but it lacks\n" "the imporant factor that there is an intent to make decisions and enact " "will.\n" "

          \n" "

          \n" -"In addition to consisting of a group of people, a polity will have a set of " -"laws\n" -"the group has decided to adhere to. In an abstract sense, membership in a " -"polity\n" -"grants a person certain rights and priviledges. For instance, membership in " -"a \n" -"school's student body may grant you the right to attend their annual prom,\n" +"In addition to consisting of a group of people, a polity will have a set " +"of laws\n" +"the group has decided to adhere to. In an abstract sense, membership in a" +" polity\n" +"grants a person certain rights and priviledges. For instance, membership " +"in a \n" +"school's student body may grant you the right to attend their annual " +"prom,\n" "and membership in a country (i.e. residency or citizenship) grants you a " "right \n" -"to live there and do certain things there, such as start companies. stand " -"in \n" +"to live there and do certain things there, such as start companies. stand" +" in \n" "elections, and so on.\n" "

          \n" "

          \n" -"Each polity has different rules - these are also called statutes, bylaws or " -"laws - \n" +"Each polity has different rules - these are also called statutes, bylaws " +"or laws - \n" "which affect the polity on two different levels.\n" "

          \n" "

          \n" "Firstly, there are meta-rules, which describe how rules are formed, how\n" "decisions are made and how governance in general \n" "happens. Wasa2il has to be flexible enough to accomodate the varying \n" -"meta-rules of a given polity, otherwise the polity may decide that Wasa2il " -"isn't \n" -"useful to them. Sometimes these rules are referred to as \"rules of procedure" -"\" \n" -"or \"constitution\", depending on the type of polity which is using them.\n" +"meta-rules of a given polity, otherwise the polity may decide that " +"Wasa2il isn't \n" +"useful to them. Sometimes these rules are referred to as \"rules of " +"procedure\" \n" +"or \"constitution\", depending on the type of polity which is using them." +"\n" "

          \n" "

          \n" -"Secondly there are external rules, which are the decisions the polity makes " -"which\n" +"Secondly there are external rules, which are the decisions the polity " +"makes which\n" "don't affect its internal decisionmaking process.\n" "

          \n" "

          \n" -"It is hard to talk about a term completely in the abstract. We can describe " -"its features, but\n" -"that only gets us so far. So let's look at some of the things that can vary " -"from one polity\n" +"It is hard to talk about a term completely in the abstract. We can " +"describe its features, but\n" +"that only gets us so far. So let's look at some of the things that can " +"vary from one polity\n" "to another, and then take a few examples in each.\n" "

          \n" "

          Scope

          \n" @@ -2548,57 +1511,57 @@ msgid "" "a common interest of its members.\n" "

          \n" "

          \n" -"La Casa Invisible is a social center in Málaga, Spain, which works in " -"the Málaga region\n" -"to promote ideas of social cohesion, autonomy, and democracy. It operates a " -"café, a book store,\n" -"a music hall, and various other projects, each of which could be considered " -"a sub-polity of\n" -"the social center itself. The scope of La Casa Invisible's actions is mostly " -"bound to decisions\n" +"La Casa Invisible is a social center in Málaga, Spain, which works" +" in the Málaga region\n" +"to promote ideas of social cohesion, autonomy, and democracy. It operates" +" a café, a book store,\n" +"a music hall, and various other projects, each of which could be " +"considered a sub-polity of\n" +"the social center itself. The scope of La Casa Invisible's actions is " +"mostly bound to decisions\n" "regarding the social center itself, and the activities that take place " "within it.\n" "

          \n" "

          \n" -"The Union of the Comoros (Udzima wa Komori) is an island nation to " -"the east of Africa, \n" -"just north of Madagascar. It has a population of 798.000 people living in an " -"area of 2.235km². \n" -"The scope of The Comoros as a polity is the land and national waters they " -"control, their airspace,\n" -"and their foreign trade, defense and other agreements they are party to. As " -"such, they have\n" -"municipal sub-polities, and are a member of the African Union, Francophonie, " -"Organization of Islamic\n" -"Cooperation, Arab League and Indian Ocean Commission superpolities, amongst " -"others.\n" +"The Union of the Comoros (Udzima wa Komori) is an island nation to" +" the east of Africa, \n" +"just north of Madagascar. It has a population of 798.000 people living in" +" an area of 2.235km². \n" +"The scope of The Comoros as a polity is the land and national waters they" +" control, their airspace,\n" +"and their foreign trade, defense and other agreements they are party to. " +"As such, they have\n" +"municipal sub-polities, and are a member of the African Union, " +"Francophonie, Organization of Islamic\n" +"Cooperation, Arab League and Indian Ocean Commission superpolities, " +"amongst others.\n" "

          \n" "

          Scale

          \n" "

          \n" "The scale of a polity determines how large it can be expected to become. " "Some polities are specifically\n" -"structured with intent to grow, while others intentionally try to stay at a " -"constant size.\n" +"structured with intent to grow, while others intentionally try to stay at" +" a constant size.\n" "

          \n" "

          \n" -"Muff Divers is a diving club in the village of Muff in Ireland. It " -"claims to be the fastest\n" +"Muff Divers is a diving club in the village of Muff in Ireland. It" +" claims to be the fastest\n" "growing diving club in the world, most likely owing to its name.\n" "

          \n" "

          Intent

          \n" "

          \n" "A polity is created around intent. Some polities intend to take over the " "world, others intend to make\n" -"the nicest cupcakes in all of the land. Some polities intend to send people " -"into space, and others\n" +"the nicest cupcakes in all of the land. Some polities intend to send " +"people into space, and others\n" "intend to track down and arrest criminals. Polities have all sorts of " "motives and intents.\n" "

          \n" "

          \n" "On the most basic level, a polity's intent is a description of what it " "intends to do. This has nothing\n" -"to do with whether the polity has the ability to do it, or whether anybody " -"or anything - such as another\n" +"to do with whether the polity has the ability to do it, or whether " +"anybody or anything - such as another\n" "polity, or the laws of physics - stand in their way.\n" "

          \n" "

          \n" @@ -2608,16 +1571,16 @@ msgid "" "

          \n" "Representative democracy, direct democracy, participatory democracy, " "dictatorship. There are lots of terms\n" -"which describe the structure of a polity. In one sense, it refers to where " -"in the structure of relations\n" +"which describe the structure of a polity. In one sense, it refers to " +"where in the structure of relations\n" "between people the authority lies. In a dictatorship, one person has " "ultimate authority, although he may\n" -"choose to grant some authority downstream to trusted advisors, who in turn " -"have trusted advisors, and so\n" -"on. In a fully egealitarian system, each individual is equipotent, meaning " -"he has an equal ability to\n" -"everybody else to instigate decisions - however, it depends on the structure " -"what ability the individual\n" +"choose to grant some authority downstream to trusted advisors, who in " +"turn have trusted advisors, and so\n" +"on. In a fully egealitarian system, each individual is equipotent, " +"meaning he has an equal ability to\n" +"everybody else to instigate decisions - however, it depends on the " +"structure what ability the individual\n" "has to actually complete the decision making.\n" "

          \n" "

          \n" @@ -2635,32 +1598,32 @@ msgstr "" msgid "Proposals" msgstr "Tillögur" -#: wasa2il/templates/help/is/proposal.html:8 +#: wasa2il/templates/help/is/proposal.html:60 msgid "" "\n" "

          \n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

          \n" "

          \n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

          \n" "

          \n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -2668,14 +1631,14 @@ msgid "" "

          \n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

          \n" "

          Proposing a new agreement

          \n" "

          \n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

          \n" "

          Proposing changes to a previous agreement

          \n" "

          \n" @@ -2689,10 +1652,10 @@ msgid "" "

          \n" "

          Making changes to a proposal

          \n" "

          \n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

            \n" "\t
          1. Remove a clause/statement from the document
          2. \n" "\t
          3. Move a clause/statement within the document
          4. \n" @@ -2703,8 +1666,9 @@ msgid "" "

            \n" "

            Voting on a proposal

            \n" "

            \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " @@ -2712,15 +1676,16 @@ msgid "" "

            \n" msgstr "" -#: wasa2il/templates/help/is/wasa2il.html:8 +#: wasa2il/templates/help/is/wasa2il.html:26 msgid "" "\n" "

            \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

            \n" "

            \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2730,34 +1695,25 @@ msgid "" "goals and mutual understandings.\n" "

            \n" "

            \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

            \n" msgstr "" -#: wasa2il/templates/profile.html:19 -msgid "Summary" -msgstr "Yfirlit" - -#: wasa2il/templates/profile.html:39 -msgid "This user hasn't provided a biography." -msgstr "Þessi notandi hefur ekki skrifað lýsingu á sjálfum sér." - #: wasa2il/templates/registration/activate.html:5 msgid "Welcome to Wasa2il!" msgstr "Velkominn í Wasa2il!" #: wasa2il/templates/registration/activate.html:6 msgid "You are now successfully signed up. Sign in to start having fun!" -msgstr "" -"Þú hefur nú verið nýskráður. Skráðu þig inn til þess að hefja skemmtunina!" +msgstr "Þú hefur nú verið nýskráður. Skráðu þig inn til þess að hefja skemmtunina!" #: wasa2il/templates/registration/activation_complete.html:7 msgid "Email verified!" @@ -2772,15 +1728,15 @@ msgid "You may now try to log in!" msgstr "Þú getur núna reynt að innskrá þig!" #: wasa2il/templates/registration/activation_complete.html:13 -#: wasa2il/templates/registration/login.html:18 +#: wasa2il/templates/registration/login.html:22 msgid "Login" msgstr "Innskrá" #: wasa2il/templates/registration/activation_email.txt:2 msgid "Please click the link below to verify your email address." msgstr "" -"Vinsamlegast smelltu á tengilinn hér fyrir neðan til að staðfesta netfangið " -"þitt." +"Vinsamlegast smelltu á tengilinn hér fyrir neðan til að staðfesta " +"netfangið þitt." #: wasa2il/templates/registration/activation_email.txt:6 #, python-format @@ -2794,58 +1750,59 @@ msgstr "Staðfesting netfangs" #: wasa2il/templates/registration/data_disclaimer.html:3 msgid "" -"As of February 12th 2014, we require the verification of all user accounts " -"via the so-called Icekey." +"As of February 12th 2014, we require the verification of all user " +"accounts via the so-called Icekey." msgstr "" "Frá og með 12. febrúar 2014 krefjumst við staðfestingar allra innskráðra " "notenda með hinum svokallaða Íslykli." -#: wasa2il/templates/registration/data_disclaimer.html:4 +#: wasa2il/templates/registration/data_disclaimer.html:5 msgid "" -"Please be advised that by registering and verifying your account, you become " -"a member of the Pirate Party of Iceland." +"Please be advised that by registering and verifying your account, you " +"become a member of the Pirate Party of Iceland." msgstr "" "Vinsamlegast athugið að með því að nýskrá og staðfesta aðgang gerist þú " "meðlimur að Pírötum." -#: wasa2il/templates/registration/data_disclaimer.html:4 +#: wasa2il/templates/registration/data_disclaimer.html:7 msgid "" -"Membership of political organizations is considered sensitive information by " -"law." -msgstr "" -"Félagatöl stjórnmálaafla teljast til persónulegra gagna samkvæmt lögum." +"Membership of political organizations is considered sensitive information" +" by law." +msgstr "Félagatöl stjórnmálaafla teljast til persónulegra gagna samkvæmt lögum." -#: wasa2il/templates/registration/data_disclaimer.html:5 +#: wasa2il/templates/registration/data_disclaimer.html:8 msgid "" -"Therefore, you should keep the following in mind when becoming a member and " -"using our system:" +"Therefore, you should keep the following in mind when becoming a member " +"and using our system:" msgstr "Því ættirðu að hafa eftirfarandi í huga þegar þú notar kerfin okkar:" -#: wasa2il/templates/registration/data_disclaimer.html:7 +#: wasa2il/templates/registration/data_disclaimer.html:10 msgid "" -"Your username is publicly visible. If you don't want to be recognized, use a " -"different one than what you use elsewhere." +"Your username is publicly visible. If you don't want to be recognized, " +"use a different one than what you use elsewhere." msgstr "" -"Notandanafnið þitt er sýnilegt öllum. Ef þú vilt fela auðkenni þitt, notaðu " -"annað en þau sem þú notar annars staðar." +"Notandanafnið þitt er sýnilegt öllum. Ef þú vilt fela auðkenni þitt, " +"notaðu annað en þau sem þú notar annars staðar." -#: wasa2il/templates/registration/data_disclaimer.html:8 +#: wasa2il/templates/registration/data_disclaimer.html:11 msgid "" "Your profile settings are mostly public, including your " -"display name, image and description. We don't fill that out for you, though." +"display name, image and description. We don't fill that out for you, " +"though." msgstr "" -"Prófíllinn þinn er að mestu sýnilegur opinberlega, þar á " -"meðal nafn þitt, mynd og lýsing. Við fyllum prófílinn þó ekki út fyrir þig." +"Prófíllinn þinn er að mestu sýnilegur opinberlega, þar á" +" meðal nafn þitt, mynd og lýsing. Við fyllum prófílinn þó ekki út fyrir " +"þig." -#: wasa2il/templates/registration/data_disclaimer.html:9 +#: wasa2il/templates/registration/data_disclaimer.html:12 msgid "Don't put anything in there that you don't want visible to the public." msgstr "Ekki setja neitt í prófílinn þinn sem þú vilt ekki að sjáist út á við." -#: wasa2il/templates/registration/data_disclaimer.html:10 +#: wasa2il/templates/registration/data_disclaimer.html:13 msgid "We do not display your email address in public." msgstr "Við sýnum ekki netföng notenda okkar opinberlega." -#: wasa2il/templates/registration/data_disclaimer.html:11 +#: wasa2il/templates/registration/data_disclaimer.html:14 msgid "If you have questions or concerns regarding privacy, please email us:" msgstr "" "Ef einhverjar spurningar vakna varðandi persónugögn, vinsamlegast sendið " @@ -2856,22 +1813,21 @@ msgstr "" msgid "and partake in democracy..." msgstr "og taktu þátt í lýðræðinu..." -#: wasa2il/templates/registration/login.html:8 +#: wasa2il/templates/registration/login.html:9 msgid "" -"If you forgot your username, you can log in or reset your password with your " -"email address or SSN instead." +"If you forgot your username, you can log in or reset your password with " +"your email address or SSN instead." msgstr "" -"Ef þú hefur gleymt notendanafni þínu, þá má einnig nota netfang eða kennitölu " -"til að skrá sig inn eða panta nýtt lykilorð." +"Ef þú hefur gleymt notendanafni þínu, þá má einnig nota netfang eða " +"kennitölu til að skrá sig inn eða panta nýtt lykilorð." -#: wasa2il/templates/registration/login.html:9 +#: wasa2il/templates/registration/login.html:11 msgid "If problems arise, please send an email to the following email address:" -msgstr "" -"Ef vandamál koma upp, vinsamlegast sendið netpóst á eftirfarandi netfang:" +msgstr "Ef vandamál koma upp, vinsamlegast sendið netpóst á eftirfarandi netfang:" -#: wasa2il/templates/registration/login.html:20 +#: wasa2il/templates/registration/login.html:24 #: wasa2il/templates/registration/password_reset_complete.html:5 -#: wasa2il/templates/registration/password_reset_confirm.html:6 +#: wasa2il/templates/registration/password_reset_confirm.html:8 #: wasa2il/templates/registration/password_reset_done.html:5 #: wasa2il/templates/registration/password_reset_form.html:5 msgid "Password reset" @@ -2885,12 +1841,6 @@ msgstr "Skráð út" msgid "We hope you'll be back soon. It'd be fun!" msgstr "Við vonum að þú komir fljótt aftur! Það væri gaman!" -#: wasa2il/templates/registration/password_change_done.html:7 -#: wasa2il/templates/registration/password_change_form.html:7 -#: wasa2il/templates/settings.html:8 -msgid "Change password" -msgstr "Breyta lykilorði" - #: wasa2il/templates/registration/password_change_done.html:11 msgid "Success! Your password has been changed." msgstr "Það tókst! Lykilorði þínu hefur verið breytt." @@ -2903,11 +1853,11 @@ msgstr "Aftur í stillingar" msgid "Password reset successfully" msgstr "Lykilorðinu hefur verið breytt" -#: wasa2il/templates/registration/password_reset_confirm.html:19 +#: wasa2il/templates/registration/password_reset_confirm.html:22 msgid "Error" msgstr "Villa" -#: wasa2il/templates/registration/password_reset_confirm.html:19 +#: wasa2il/templates/registration/password_reset_confirm.html:23 msgid "Password reset failed" msgstr "Mistókst að breyta lykilorðinu! Kannski var vefslóðin úrelt?" @@ -2932,16 +1882,16 @@ msgstr "Mundu að kíkja í ruslpóstinn!" #: wasa2il/templates/registration/password_reset_done.html:12 msgid "" -"If you do not receive an email, try resetting your password with other email " -"addresses you may have used." +"If you do not receive an email, try resetting your password with other " +"email addresses you may have used." msgstr "" "Ef þú fékkst engan póst, reyndu þá að endurstilla lykilorðið með öðrum " "netföngum sem þú gætir hafa notað." #: wasa2il/templates/registration/password_reset_done.html:13 msgid "" -"For security and privacy reasons, we cannot tell you whether you used the " -"correct email address. Sorry!" +"For security and privacy reasons, we cannot tell you whether you used the" +" correct email address. Sorry!" msgstr "" "Af öryggis- og persónuverndarástæðum, getum við því miður ekki gefið það " "upp á vefnum hvort þú notaðir rétt netfang." @@ -2958,14 +1908,12 @@ msgstr "" "%(site_name)s." #: wasa2il/templates/registration/password_reset_email.html:4 -msgid "" -"If you are unfamiliar with this request, you should ignore this message." +msgid "If you are unfamiliar with this request, you should ignore this message." msgstr "Ef þú kannast ekki við slíka beiðnu skaltu hunsa þessi skilaboð." #: wasa2il/templates/registration/password_reset_email.html:6 msgid "To reset your password, please click the following link:" -msgstr "" -"Til að endurstilla lykilorðið þitt skaltu smella á eftirfarandi tengil:" +msgstr "Til að endurstilla lykilorðið þitt skaltu smella á eftirfarandi tengil:" #: wasa2il/templates/registration/password_reset_form.html:5 msgid "The tricky email question" @@ -2985,11 +1933,11 @@ msgstr "Beiðni um endurstillingu lykilorðs" #: wasa2il/templates/registration/registration_complete.html:11 msgid "" -"Please check your email to find the verification message we have just sent, " -"and click the appropriate link." +"Please check your email to find the verification message we have just " +"sent, and click the appropriate link." msgstr "" -"Í tölvupósti þínum ættirðu að finna skilaboð frá okkur til staðfestingar á " -"netfanginu þínu. Vinsamlegast finndu þann póst og smelltu á viðeigandi " +"Í tölvupósti þínum ættirðu að finna skilaboð frá okkur til staðfestingar " +"á netfanginu þínu. Vinsamlegast finndu þann póst og smelltu á viðeigandi " "tengil." #: wasa2il/templates/registration/saml_error.html:6 @@ -3014,8 +1962,8 @@ msgstr "Fleiri en einn reikningur til" #: wasa2il/templates/registration/verification_duplicate.html:8 msgid "" -"It appears that you already have a different account. Its username and email " -"address are provided below. Please try logging in again using its " +"It appears that you already have a different account. Its username and " +"email address are provided below. Please try logging in again using its " "credentials." msgstr "" "Það lítur út fyrir að þú eigir nú þegar reikning. Fyrir neðan sjást " @@ -3042,8 +1990,8 @@ msgstr "Staðfestingar er þarfnast" #: wasa2il/templates/registration/verification_needed.html:8 msgid "" -"The account registration process cannot be completed until verification has " -"been provided." +"The account registration process cannot be completed until verification " +"has been provided." msgstr "Staðfestingu á auðkenni þarf til þess að klára skráningarferli." #: wasa2il/templates/registration/verification_needed.html:9 @@ -3054,533 +2002,3 @@ msgstr "Vinsamlegast veljið einn eftirfarandi valmöguleika" msgid "Verify identity" msgstr "Staðfesta auðkenni" -#: wasa2il/templates/settings.html:9 -msgid "Settings" -msgstr "Stillingar" - -#: wasa2il/templates/settings.html:10 -msgid "You are signed in as" -msgstr "Þú ert innskráð(ur) sem" - -#~ msgid "Drag candidates here." -#~ msgstr "Dragðu frambjóðendur hingað." - -#~ msgid "" -#~ "You don't have to submit your vote; whatever is on your ballot when the " -#~ "vote deadline passes will be counted." -#~ msgstr "" -#~ "Það þarf ekki að skila inn atkvæði sérstaklega, heldur verður það talið " -#~ "eins og það lítur út þegar kosningunni lýkur. Þú getur því breytt röðun " -#~ "frambjóðenda eins oft og þú vilt fram að því að kosningafrestur rennur út." - -#~ msgid "Drag candidates to change order" -#~ msgstr "Dragðu frambjóðendur með músinni til að breyta röðun" - -#~ msgid "topics" -#~ msgstr "málaflokkar" - -#~ msgid "agreements" -#~ msgstr "samþykktir" - -#~ msgid "subpolities" -#~ msgstr "undirþing" - -#~ msgid "is not viewable by non-members." -#~ msgstr "er ekki sýnilegt þeim sem eru ekki meðlimir." - -#~ msgid "Password changed" -#~ msgstr "Lykilorði breytt" - -#~ msgid "Voting closes in" -#~ msgstr "Kosningu lýkur eftir" - -#~ msgid "Leave polity" -#~ msgstr "Yfirgefa þing" - -#~ msgid "This polity is delegated." -#~ msgstr "This polity is delegated." - -#~ msgid "You have" -#~ msgstr "You have" - -#~ msgid "delegations" -#~ msgstr "delegations" - -#~ msgid "Leave this polity?" -#~ msgstr "Afskrá úr þingi?" - -#~ msgid "Are you sure you want to stop being a member of this polity?" -#~ msgstr "Ertu viss um að þú viljir ganga úr þessu þingi?" - -#~ msgid "Only members get to participate in the polity's activities." -#~ msgstr "Aðeins meðlimir geta tekið þátt í starfi þingsins." - -#~ msgid "No, I hit that button by accident" -#~ msgstr "Nei, ég rakst óvart á takkann" - -#~ msgid "Yes, I want to leave this polity." -#~ msgstr "Já, ég vil yfirgefa þingið." - -#~ msgid "followers" -#~ msgstr "fylgjendur" - -#~ msgid "taking action" -#~ msgstr "þátttakendur" - -#~ msgid "issues" -#~ msgstr "málefni" - -#~ msgid "Your Polities" -#~ msgstr "Þingin þín" - -#~ msgid "Other Polities" -#~ msgstr "Önnur þing" - -#~ msgid "Start a Policy" -#~ msgstr "Ný stefna" - -#~ msgid "Join Code" -#~ msgstr "Kóða" - -#~ msgid "Free Software" -#~ msgstr "Frír hugbúnaður" - -#~ msgid "Invite threshold" -#~ msgstr "Boðsþröskuldur" - -#~ msgid "How many members need to vouch for a new user before he can join." -#~ msgstr "" -#~ "Hversu margir meðlimir þurfa að bjóða nýjum notanda áður en hann getur " -#~ "orðið meðlimur." - -#~ msgid "Are there officers?" -#~ msgstr "Eru umsjónarmenn?" - -#~ msgid "Is there a group of people who oversee the polity?" -#~ msgstr "Er hópur fólks sem hefur umsjón með þinginu?" - -#~ msgid "Account created" -#~ msgstr "Aðgangur skráður" - -#~ msgid "FAQ" -#~ msgstr "Algengar spurningar" - -#~ msgid "How electronic democracy work?" -#~ msgstr "Hvernig virkar rafrænt lýðræði?" - -#~ msgid "Who can use Wasa2il?" -#~ msgstr "Hver getur notað Wasa2il?" - -#~ msgid "What does Wasa2il mean?" -#~ msgstr "Hvað þýðir Wasa2il?" - -#~ msgid "New polities" -#~ msgstr "Ný þing" - -#~ msgid "Recent decisions" -#~ msgstr "Nýlegar ákvarðanir" - -#, fuzzy -#~ msgid "Browse other polities" -#~ msgstr "Skoða þing" - -#, fuzzy -#~ msgid "Take Action!" -#~ msgstr "Actions" - -#, fuzzy -#~ msgid "Browse polities" -#~ msgstr "Skoða þing" - -#, fuzzy -#~ msgid "Edit your profile" -#~ msgstr "Mín síða" - -#, fuzzy -#~ msgid "Create a polity" -#~ msgstr "Yfirgefa þing" - -#~ msgid "Your documents" -#~ msgstr "Þín skjöl" - -#, fuzzy -#~ msgid "in your polities" -#~ msgstr "Þingin þín" - -#, fuzzy -#~ msgid "New proposals" -#~ msgstr "Change proposals" - -#~ msgid "Comparison with effective version" -#~ msgstr "Samanburður við gildandi útgáfu" - -#~ msgid "This issue is closed." -#~ msgstr "Þetta mál er lokað." - -#~ msgid "Diff" -#~ msgstr "Samanburður" - -#~ msgid "Related to issue:" -#~ msgstr "Tengt máli:" - -#~ msgid "Import agreement" -#~ msgstr "Flytja inn samþykkt" - -#~ msgid "Choose an agreement to import:" -#~ msgstr "Choose an agreement to import:" - -#~ msgid "" -#~ "The purpose of importing an agreement to an issue is to be able to " -#~ "propose changes to it." -#~ msgstr "" -#~ "The purpose of importing an agreement to an issue is to be able to " -#~ "propose changes to it." - -#~ msgid "Import document to issue" -#~ msgstr "Import document to issue" - -#~ msgid "Propose a change" -#~ msgstr "Stinga upp á breytingu" - -#~ msgid "Want to propose a change?" -#~ msgstr "Viltu stinga upp á breytingu?" - -#~ msgid "Click here!" -#~ msgstr "Smelltu hér!" - -#~ msgid "" -#~ "Please note that this document is still a proposal and has not been " -#~ "adopted by vote." -#~ msgstr "" -#~ "Vinsamlegast athugið að þetta skjal er tillaga og hefur ekki verið " -#~ "samþykkt með atkvæðagreiðslu." - -#~ msgid "" -#~ "Please note that this document is still a draft proposal and has not been " -#~ "adopted by vote." -#~ msgstr "" -#~ "Vinsamlegast athugið að þetta skjal er drög að tillögu og hefur ekki " -#~ "verið samþykkt með atkvæðagreiðslu." - -#, fuzzy -#~ msgid "Version status" -#~ msgstr "Ályktanir" - -#~ msgid "Closed elections" -#~ msgstr "Lokaðar kosningar" - -#~ msgid "Contributors to this document" -#~ msgstr "Höfundar að þessu skjali" - -#~ msgid "Deadline for votes:" -#~ msgstr "Tímamörk fyrir atkvæði:" - -#~ msgid "Votes:" -#~ msgstr "Atkvæði:" - -#~ msgid "Yes:" -#~ msgstr "Já:" - -#~ msgid "No:" -#~ msgstr "Nei:" - -#~ msgid "" -#~ "Documents are structured texts which contain the laws of the polity, or " -#~ "proposals for such laws." -#~ msgstr "" -#~ "Skjöl eru texti með ákveðnu sniði sem inniheldur lög þingsins eða " -#~ "tillögur að slíkum lögum." - -#~ msgid "Proposed documents" -#~ msgstr "Tillögur" - -#~ msgid "Documents you are working on that haven't been proposed:" -#~ msgstr "Documents you are working on that haven't been proposed:" - -#~ msgid "This user has created:" -#~ msgstr "Þessi notandi hefur búið til:" - -#~ msgid "polities" -#~ msgstr "þing" - -#~ msgid "documents" -#~ msgstr "skjöl" - -#~ msgid "Candidates:" -#~ msgstr "Frambjóðendur:" - -#~ msgid "Voting system:" -#~ msgstr "Kosningakerfi:" - -#~ msgid "Submit" -#~ msgstr "Submit" - -#~ msgid "Add" -#~ msgstr "Bæta við" - -#~ msgid "Edit" -#~ msgstr "Breytihamur" - -#, fuzzy -#~ msgctxt "Version" -#~ msgid "Active" -#~ msgstr "Actions" - -#~ msgid "Attendance list" -#~ msgstr "Mætingarlisti" - -#~ msgid "Attend meeting" -#~ msgstr "Mæta á fund" - -#~ msgid "You can sign in to attendance when the meeting has started." -#~ msgstr "Þú getur skráð þig á mætingarlista fundarins eftir að hann hefst." - -#~ msgid "Meeting managers" -#~ msgstr "Fundarstjórar" - -#~ msgid "This meeting will start in" -#~ msgstr "Þessi fundur byrjar eftir" - -#~ msgid "This meeting is ongoing." -#~ msgstr "Þessi fundir er í gangi." - -#~ msgid "This meeting ended at" -#~ msgstr "Þessi fundur endaði kl." - -#~ msgid "Ajourn meeting" -#~ msgstr "Slíta fundi" - -#~ msgid "Close agenda" -#~ msgstr "Loka dagskrá" - -#~ msgid "Open agenda" -#~ msgstr "Opna dagskrá" - -#~ msgid "Previous agenda item" -#~ msgstr "Fyrri dagskrárliður" - -#~ msgid "Next agenda item" -#~ msgstr "Næsti dagskrárliður" - -#~ msgid "Previous speaker" -#~ msgstr "Fyrri ræðumaður" - -#~ msgid "Next speaker" -#~ msgstr "Næsti ræðumaður" - -#~ msgid "Add speaker" -#~ msgstr "Add speaker" - -#~ msgid "Want to talk" -#~ msgstr "Biðja um orðið" - -#~ msgid "Direct response" -#~ msgstr "Svara ræðumanni" - -#~ msgid "Clarify" -#~ msgstr "Skýra ummæli" - -#~ msgid "Point of order" -#~ msgstr "Athugasemd um fundarstjórn" - -#~ msgid "Who?" -#~ msgstr "Who?" - -#~ msgid "Agenda item title" -#~ msgstr "Titill dagskrárliðs" - -#~ msgid "Start meeting early?" -#~ msgstr "Hefja fundinn snemma?" - -#~ msgid "The meeting is scheduled to start at " -#~ msgstr "Þessi fundur á að byrja klukkan " - -#~ msgid "Are you sure you want to start this meeting ahead of schedule?" -#~ msgstr "Ertu viss um að þú viljir hefja fundinn á undan áætlun?" - -#~ msgid "No, don't start the meeting!" -#~ msgstr "Nei, ekki hefja fundinn!" - -#~ msgid "Yes, start the meeting." -#~ msgstr "Já, hefjum fundinn." - -#~ msgid "Request to join polity" -#~ msgstr "Beiðni um að fara í þing" - -#~ msgid "Your request to join has been sent." -#~ msgstr "Beiðni þín um inngöngu hefur verið send." - -#~ msgid "Your request to join this polity is still pending." -#~ msgstr "Beiðni þín um þáttöku í þessu þingi, bíður en samþykkis." - -#~ msgid "Members of this polity" -#~ msgstr "Meðlimir þessa þings" - -#~ msgid "Users requesting membership" -#~ msgstr "Notendur sem óska aðildar" - -#~ msgid "Members" -#~ msgstr "Meðlimir" - -#~ msgid "What is this?" -#~ msgstr "Hvað er þetta?" - -#~ msgid "" -#~ "As required by law, we treat our member database with confidentiality." -#~ msgstr "Við förum með félagatal okkar sem trúnaðarmál samkvæmt lögum." - -#, fuzzy -#~ msgid "Candidates voted" -#~ msgstr "Frambjóðendur" - -#, fuzzy -#~ msgid "" -#~ "Membership-related issues may be raised by sending an email to the " -#~ "following address:" -#~ msgstr "" -#~ "Ef vandamál koma upp, vinsamlegast sendið netpóst á eftirfarandi netfang:" - -#, fuzzy -#~ msgid "Create account" -#~ msgstr "Yfirgefa þing" - -#~ msgid "‫وسائل" -#~ msgstr "‫وسائل" - -#~ msgid "New reference" -#~ msgstr "Ný tilvísun" - -#~ msgid "New assumption" -#~ msgstr "Ný forsenda" - -#~ msgid "New statement" -#~ msgstr "Ný fullyrðing" - -#~ msgid "New subheading" -#~ msgstr "Ný millifyrirsögn" - -#~ msgid "Import structure" -#~ msgstr "Import structure" - -#~ msgid "This document has been proposed." -#~ msgstr "This document has been proposed." - -#~ msgid "" -#~ "Changes you make to it now will become change proposals, which will be " -#~ "voted on individually." -#~ msgstr "" -#~ "Changes you make to it now will become change proposals, which will be " -#~ "voted on individually." - -#~ msgid "" -#~ "In order to make change proposals to it, you must import it into a new " -#~ "open issue." -#~ msgstr "" -#~ "In order to make change proposals to it, you must import it into a new " -#~ "open issue." - -#~ msgid "Change proposals" -#~ msgstr "Change proposals" - -#~ msgid "Deleted" -#~ msgstr "Deleted" - -#~ msgid "Moved" -#~ msgstr "Moved" - -#~ msgid "Added at beginning" -#~ msgstr "Added at beginning" - -#~ msgid "Added after:" -#~ msgstr "Added after:" - -#~ msgid "Save reference" -#~ msgstr "Vista tilvísun" - -#~ msgid "Save assumption" -#~ msgstr "Vistaðu forsendu" - -#~ msgid "Save statement" -#~ msgstr "Vista fullyrðingu" - -#~ msgid "Save subheading" -#~ msgstr "Vista millifyrirsögn" - -#~ msgid "Import statements" -#~ msgstr "Import statements" - -#~ msgid "Import" -#~ msgstr "Import" - -#~ msgid "Add reference" -#~ msgstr "Bæta við tilvísun" - -#~ msgid "Add assumption" -#~ msgstr "Bæta við forsendu" - -#~ msgid "Add statement" -#~ msgstr "Bæta við fullyrðingu" - -#~ msgid "Add subheading" -#~ msgstr "Bæta við millifyrirsögn" - -#~ msgid "New meeting" -#~ msgstr "Nýr fundur" - -#~ msgid "Show ongoing meetings" -#~ msgstr "Sýna fundi sem eru í gangi" - -#~ msgid "Show upcoming meetings" -#~ msgstr "Sýna fundi á dagskrá" - -#~ msgid "Show finished meetings" -#~ msgstr "Sýna lokna fundi" - -#~ msgid "Meetings" -#~ msgstr "Fundir" - -#~ msgid "physical or virtual" -#~ msgstr "í kjötheimi eða netheimi" - -#~ msgid "" -#~ "A meeting is an event where people come together to discuss a set of " -#~ "agenda items." -#~ msgstr "" -#~ "Fundur er atburður þar sem fólk kemur saman til að ræða ákveðna " -#~ "dagskrárliði." - -#~ msgid "When" -#~ msgstr "Hvenær" - -#~ msgid "Where" -#~ msgstr "Hvar" - -#~ msgid "Organized by" -#~ msgstr "Skipulagt af" - -#~ msgid "Delegations" -#~ msgstr "Framvísanir" - -#~ msgid "votes entrusted to others" -#~ msgstr "atkvæði falin öðrum" - -#~ msgid "You can set up delgations for the polity, for topics, or for issues." -#~ msgstr "" -#~ "You can set up delgations for the polity, for topics, or for issues." - -#~ msgid "" -#~ "Here you can see all of your active delegations and where they lead to." -#~ msgstr "" -#~ "Here you can see all of your active delegations and where they lead to." - -#~ msgid "" -#~ "A polity can have subordinate organizational units, such as how a " -#~ "municipality relates to a country." -#~ msgstr "Þing getur haft undirþing, svo sem það hvernig bær tilheyrir landi." - -#, fuzzy -#~ msgid "Discussion Forums" -#~ msgstr "Umræða" - -#~ msgid "Select topics" -#~ msgstr "Select topics" diff --git a/wasa2il/locale/nl/LC_MESSAGES/django.po b/wasa2il/locale/nl/LC_MESSAGES/django.po index ab885e25..44f6f012 100644 --- a/wasa2il/locale/nl/LC_MESSAGES/django.po +++ b/wasa2il/locale/nl/LC_MESSAGES/django.po @@ -1,1346 +1,1212 @@ + msgid "" msgstr "" -"Project-Id-Version: wasa2il\n" +"Project-Id-Version: wasa2il\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-18 18:17+0000\n" +"POT-Creation-Date: 2016-08-10 10:13+0000\n" "PO-Revision-Date: 2013-01-24 19:50+0100\n" "Last-Translator: smari \n" +"Language: nl\n" "Language-Team: Dutch\n" -"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: crowdin.net\n" +"Generated-By: Babel 2.3.4\n" + +#: core/authentication.py:57 core/forms.py:46 +msgid "E-mail" +msgstr "" + +#: core/authentication.py:58 +msgid "Password" +msgstr "" + +#: core/base_classes.py:8 core/models.py:46 +#: wasa2il/templates/forum/forum_detail.html:18 +msgid "Name" +msgstr "" + +#: core/forms.py:46 +msgid "The email address you'd like to use for the site." +msgstr "" + +#: core/forms.py:63 +msgid "Filename must contain file extension" +msgstr "" + +#: core/models.py:32 +msgid "Description" +msgstr "" + +#: core/models.py:46 +msgid "The name to display on the site." +msgstr "" + +#: core/models.py:47 +msgid "E-mail visible" +msgstr "" + +#: core/models.py:47 +msgid "Whether to display your email address on your profile page." +msgstr "" + +#: core/models.py:48 +msgid "Bio" +msgstr "" + +#: core/models.py:49 +msgid "Picture" +msgstr "" + +#: core/models.py:53 +msgid "Language" +msgstr "" + +#: core/models.py:54 +msgid "Whether to show all topics in a polity, or only starred." +msgstr "" + +#: core/models.py:170 +msgid "Officers" +msgstr "" + +#: core/models.py:172 +msgid "Publicly listed?" +msgstr "" + +#: core/models.py:172 +msgid "Whether the polity is publicly listed or not." +msgstr "" + +#: core/models.py:173 +msgid "Publicly viewable?" +msgstr "" + +#: core/models.py:173 +msgid "Whether non-members can view the polity and its activities." +msgstr "" + +#: core/models.py:174 +msgid "Can only officers make new issues?" +msgstr "" + +#: core/models.py:174 +msgid "" +"If this is checked, only officers can create new issues. If it's " +"unchecked, any member can start a new issue." +msgstr "" + +#: core/models.py:175 +msgid "Front polity?" +msgstr "" + +#: core/models.py:175 +msgid "" +"If checked, this polity will be displayed on the front page. The first " +"created polity automatically becomes the front polity." +msgstr "" + +#: core/models.py:303 +msgid "Accepted at assembly" +msgstr "" + +#: core/models.py:304 +msgid "Rejected at assembly" +msgstr "" + +#: core/models.py:313 wasa2il/templates/core/polity_detail.html:24 +#: wasa2il/templates/core/polity_detail.html:107 +#: wasa2il/templates/core/polity_detail.html:114 +#: wasa2il/templates/core/polity_list.html:17 +msgid "Topics" +msgstr "Onderwerpen" + +#: core/models.py:319 +msgid "Ruleset" +msgstr "" + +#: core/models.py:321 wasa2il/templates/core/issue_detail.html:39 +msgid "Special process" +msgstr "" -#: core/models.py:357 templates/core/polity_detail.html:111 +#: core/models.py:510 wasa2il/templates/core/issues_new.html:18 +#: wasa2il/templates/core/polity_detail.html:47 #, fuzzy msgid "Issue" msgstr "Onderwerpen" -#: core/models.py:361 +#: core/models.py:515 #, fuzzy msgid "Topic" msgstr "Onderwerpen" -#: core/models.py:365 templates/core/polity_list.html:14 +#: core/models.py:520 wasa2il/templates/core/polity_list.html:16 msgid "Polity" msgstr "Polity" -#: templates/403.html:5 +#: core/models.py:659 +msgid "Proposed" +msgstr "" + +#: core/models.py:660 wasa2il/templates/core/issue_detail.html:49 +msgid "Accepted" +msgstr "" + +#: core/models.py:661 wasa2il/templates/core/issue_detail.html:49 +msgid "Rejected" +msgstr "" + +#: core/models.py:662 +msgid "Deprecated" +msgstr "" + +#: core/models.py:800 wasa2il/templates/core/election_detail.html:93 +msgid "Voting system" +msgstr "" + +#: core/models.py:801 wasa2il/templates/core/election_detail.html:74 +#: wasa2il/templates/core/election_list.html:19 +msgid "Deadline for candidacy" +msgstr "" + +#: core/models.py:802 +msgid "Start time for votes" +msgstr "" + +#: core/models.py:803 wasa2il/templates/core/election_detail.html:75 +#: wasa2il/templates/core/election_list.html:20 +#: wasa2il/templates/core/issue_detail.html:36 +msgid "Deadline for votes" +msgstr "" + +#: core/models.py:814 wasa2il/templates/core/election_detail.html:77 +msgid "Membership deadline" +msgstr "" + +#: core/models.py:817 wasa2il/templates/base.html:142 +msgid "Instructions" +msgstr "" + +#: core/views.py:423 +msgid "voting" +msgstr "" + +#: wasa2il/templates/403.html:5 msgid "403 Access Denied" msgstr "" -#: templates/404.html:5 +#: wasa2il/templates/404.html:5 msgid "404 File Not Found" msgstr "" -#: templates/base.html:7 -msgid "wassa2il" -msgstr "wassa2il" +#: wasa2il/templates/500.html:7 +msgid "Something bad happened!" +msgstr "" -#: templates/base.html:52 -msgid "‫وسائل" -msgstr "‫وسائل" +#: wasa2il/templates/500.html:9 +msgid "" +"A bunch of well-trained monkeys have been notified and they will take a " +"look at the problem as soon as possible." +msgstr "" + +#: wasa2il/templates/500.html:11 +msgid "" +"Sometimes things break only for a few seconds, so it may work if you try " +"again." +msgstr "" + +#: wasa2il/templates/500.html:13 +msgid "Otherwise, please email us at" +msgstr "" -#: templates/base.html:65 templates/notLoginInHome.html:47 -#: templates/help/agreement.html:6 templates/help/authors.html:6 -#: templates/help/copyright.html:6 templates/help/index.html:6 -#: templates/help/polity.html:6 templates/help/proposal.html:6 -#: templates/help/wasa2il.html:6 +#: wasa2il/templates/base.html:8 +msgid "Voting System - Pirate Party Iceland" +msgstr "" + +#: wasa2il/templates/base.html:91 wasa2il/templates/core/issue_detail.html:78 +msgid "There was an error while processing your vote. Please try again." +msgstr "" + +#: wasa2il/templates/base.html:94 +msgid "Your votes have been submitted!" +msgstr "" + +#: wasa2il/templates/base.html:95 +msgid "" +"You can continue adding, removing or reordering candidates until the " +"deadline." +msgstr "" + +#: wasa2il/templates/base.html:98 +#: wasa2il/templates/core/election_detail.html:175 +msgid "Working..." +msgstr "" + +#: wasa2il/templates/base.html:107 wasa2il/templates/help/is/agreement.html:6 +#: wasa2il/templates/help/is/authors.html:6 +#: wasa2il/templates/help/is/copyright.html:6 +#: wasa2il/templates/help/is/index.html:6 +#: wasa2il/templates/help/is/polity.html:6 +#: wasa2il/templates/help/is/proposal.html:6 +#: wasa2il/templates/help/is/wasa2il.html:6 msgid "Help" msgstr "Help" -#: templates/base.html:69 +#: wasa2il/templates/base.html:113 msgid "My profile" msgstr "" -#: templates/base.html:70 +#: wasa2il/templates/base.html:114 #, fuzzy msgid "My settings" msgstr "Vergaderingen" -#: templates/base.html:71 +#: wasa2il/templates/base.html:116 +#: wasa2il/templates/registration/verification_needed.html:12 msgid "Logout" msgstr "Uitloggen" -#: templates/base.html:75 templates/hom01.html:18 -#: templates/registration/login.html:6 templates/registration/login.html:15 -#: templates/registration/password_reset_complete.html:9 +#: wasa2il/templates/base.html:120 wasa2il/templates/entry.html:17 +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/password_reset_complete.html:9 msgid "Log in" msgstr "Inloggen" -#: templates/base.html:76 templates/hom01.html:12 -#: templates/notLoginInHome.html:14 templates/registration/login.html:16 +#: wasa2il/templates/base.html:121 wasa2il/templates/entry.html:11 +#: wasa2il/templates/registration/login.html:23 +#: wasa2il/templates/registration/registration_form.html:6 +#: wasa2il/templates/registration/registration_form.html:26 msgid "Sign up" msgstr "Aanmelden" -#: templates/base.html:91 +#: wasa2il/templates/base.html:127 +msgid "Search agreements" +msgstr "" + +#: wasa2il/templates/base.html:139 msgid "Back to top" msgstr "Terug naar boven" -#: templates/base.html:92 +#: wasa2il/templates/base.html:140 msgid "About wasa2il" msgstr "Over wasa2il" -#: templates/base.html:93 +#: wasa2il/templates/base.html:141 msgid "License" msgstr "Licentie" -#: templates/base.html:94 templates/help/authors.html:6 +#: wasa2il/templates/base.html:143 wasa2il/templates/help/is/authors.html:6 msgid "Authors" msgstr "Auteurs" -#: templates/hom01.html:13 +#: wasa2il/templates/entry.html:12 msgid "In order to use Wasa2il you need to register an account." msgstr "Om Wasa2il te kunnen gebruiken moet u zich registreren voor een" -#: templates/hom01.html:19 +#: wasa2il/templates/entry.html:18 msgid "If you log in, you can participate in your polities." msgstr "Als u inlogt kunt u deelneemen in uw beslissingsgroepen" -#: templates/hom01.html:24 templates/notLoginInHome.html:33 +#: wasa2il/templates/entry.html:23 msgid "Browse Polities" msgstr "Browse Beslissingsgroepen" -#: templates/hom01.html:25 +#: wasa2il/templates/entry.html:24 msgid "You can browse publicly visible polities without registering." msgstr "U kunt openbaar zichtbare beslissingsgroepen bekijken zonder" -#: templates/hom01.html:35 -msgid "FAQ" -msgstr "FAQ" - -#: templates/hom01.html:37 templates/help/index.html:15 -msgid "What is a polity?" -msgstr "Wat is een beslissingsgroep?" - -#: templates/hom01.html:38 -msgid "How electronic democracy work?" -msgstr "How werkt electronische democratie ? " - -#: templates/hom01.html:39 -msgid "Who can use Wasa2il?" -msgstr "Wie kan Wasa2il gebruiken?" - -#: templates/hom01.html:40 -msgid "What does Wasa2il mean?" -msgstr "Wat betekend Wasa2il?" - -#: templates/hom01.html:44 -msgid "New polities" -msgstr "Nieuwe beslissingsgroepen." - -#: templates/hom01.html:52 -msgid "Recent decisions" -msgstr "Recente besluiten" - -#: templates/home.html:8 -#, fuzzy -msgid "Your polities" -msgstr "Uw Beslissingsgroepen" - -#: templates/home.html:14 -#, fuzzy -msgid "Browse other polities" -msgstr "Browse Beslissingsgroepen" - -#: templates/home.html:19 -#, fuzzy -msgid "Take Action!" -msgstr "Veronderstellingen" - -#: templates/home.html:21 -#, fuzzy -msgid "Browse polities" -msgstr "Browse Beslissingsgroepen" - -#: templates/home.html:22 -msgid "Edit your profile" -msgstr "" - -#: templates/home.html:23 -#, fuzzy -msgid "Create a polity" -msgstr "Verlaat de beslissingsgroep" - -#: templates/home.html:30 templates/core/issue_detail.html:66 -#, fuzzy -msgid "Your documents" -msgstr "Uw Documenten" - -#: templates/home.html:33 templates/home.html.py:51 -#: templates/core/topic_detail.html:63 -msgid "in" -msgstr "in" - -#: templates/home.html:39 -msgid "Recently adopted law" -msgstr "" - -#: templates/home.html:39 templates/home.html.py:48 -#, fuzzy -msgid "in your polities" -msgstr "Uw Beslissingsgroepen" - -#: templates/home.html:48 -#, fuzzy -msgid "New proposals" -msgstr "Withdraw proposal" - -#: templates/notLoginInHome.html:23 -msgid "Start a Policy" -msgstr "Start een beleid" - -#: templates/notLoginInHome.html:49 -msgid "Join Code" -msgstr "Voeg je bij code" - -#: templates/notLoginInHome.html:51 -msgid "Free Software" -msgstr "Free Software" - -#: templates/profile.html:18 +#: wasa2il/templates/profile.html:19 msgid "Summary" msgstr "" -#: templates/profile.html:31 +#: wasa2il/templates/profile.html:39 msgid "This user hasn't provided a biography." msgstr "" -#: templates/profile.html:37 -msgid "This user has created:" +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +#: wasa2il/templates/profile.html:55 +msgid "Version" msgstr "" -#: templates/profile.html:40 -#, fuzzy -msgid "polities" -msgstr "Polities" - -#: templates/profile.html:41 -#, fuzzy -msgid "issues" -msgstr "Onderwerpen" - -#: templates/profile.html:42 -msgid "documents" -msgstr "documenten" - -#: templates/profile.html:63 -msgid "is not viewable by non-members." -msgstr "" +#: wasa2il/templates/core/document_list.html:10 +#: wasa2il/templates/core/polity_list.html:18 wasa2il/templates/search.html:6 +msgid "Documents" +msgstr "Documents" -#: templates/settings.html:7 -#: templates/registration/password_change_done.html:5 -#: templates/registration/password_change_form.html:5 +#: wasa2il/templates/registration/password_change_done.html:7 +#: wasa2il/templates/registration/password_change_form.html:7 +#: wasa2il/templates/settings.html:8 #, fuzzy msgid "Change password" msgstr "Withdraw proposal" -#: templates/settings.html:8 +#: wasa2il/templates/settings.html:9 #, fuzzy msgid "Settings" msgstr "Vergaderingen" -#: templates/settings.html:9 +#: wasa2il/templates/settings.html:10 msgid "You are signed in as" msgstr "" -#: templates/settings.html:16 -#: templates/registration/password_change_form.html:10 -#: templates/registration/password_reset_confirm.html:13 -msgid "Submit" -msgstr "" +#: wasa2il/templates/core/document_form.html:18 +#: wasa2il/templates/core/document_update.html:121 +#: wasa2il/templates/core/election_form.html:35 +#: wasa2il/templates/core/issue_form.html:30 +#: wasa2il/templates/core/polity_form.html:13 +#: wasa2il/templates/core/topic_form.html:14 +#: wasa2il/templates/forum/discussion_form.html:16 +#: wasa2il/templates/forum/forum_form.html:17 +#: wasa2il/templates/registration/password_change_form.html:21 +#: wasa2il/templates/registration/password_reset_confirm.html:13 +#: wasa2il/templates/settings.html:19 +msgid "Save" +msgstr "Save" -#: templates/core/_delegations_table.html:4 +#: wasa2il/templates/core/_delegations_table.html:4 msgid "Type" msgstr "Type" -#: templates/core/_delegations_table.html:5 +#: wasa2il/templates/core/_delegations_table.html:5 msgid "Item" msgstr "" -#: templates/core/_delegations_table.html:6 +#: wasa2il/templates/core/_delegations_table.html:6 msgid "To" msgstr "" -#: templates/core/_delegations_table.html:7 +#: wasa2il/templates/core/_delegations_table.html:7 +#: wasa2il/templates/core/issue_detail.html:49 msgid "Result" msgstr "" -#: templates/core/_delegations_table.html:8 -#: templates/core/_delegations_table.html:16 -#: templates/core/delegate_detail.html:29 +#: wasa2il/templates/core/_delegations_table.html:8 +#: wasa2il/templates/core/_delegations_table.html:16 +#: wasa2il/templates/core/delegate_detail.html:29 msgid "Details" msgstr "" -#: templates/core/_delegations_table.html:21 +#: wasa2il/templates/core/_delegations_table.html:21 #, fuzzy msgid "There are no delegations" msgstr "Er zijn hier geen documenten!" -#: templates/core/_delegations_table.html:22 +#: wasa2il/templates/core/_delegations_table.html:22 #, fuzzy msgid "What is a delegation?" msgstr "What is a topic?" -#: templates/core/_document_agreement_list_table.html:4 -#: templates/core/_document_list_table.html:4 -#: templates/core/_document_proposals_list_table.html:4 +#: wasa2il/templates/core/_document_agreement_list_table.html:4 +#: wasa2il/templates/core/_document_list_table.html:4 +#: wasa2il/templates/core/_document_proposals_list_table.html:4 msgid "Document" msgstr "Document" -#: templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/issue_detail.html:44 +#: wasa2il/templates/core/issue_detail.html:80 +msgid "Yes" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:6 +#: wasa2il/templates/core/issue_detail.html:45 +#: wasa2il/templates/core/issue_detail.html:82 +msgid "No" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:7 +#: wasa2il/templates/core/issue_detail.html:81 +msgid "Abstain" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:8 msgid "Adopted" msgstr "Aangenomen" -#: templates/core/_document_agreement_list_table.html:15 +#: wasa2il/templates/core/_document_agreement_list_table.html:27 msgid "This polity has no agreements." msgstr "Deze beslissingsgroep heeft geen overeenkomsten." -#: templates/core/_document_agreement_list_table.html:16 -#: templates/help/polity.html:119 templates/help/proposal.html:64 +#: wasa2il/templates/core/_document_agreement_list_table.html:28 +#: wasa2il/templates/help/is/polity.html:119 +#: wasa2il/templates/help/is/proposal.html:64 msgid "What is an agreement?" msgstr "Wat is een overeenkomst?" -#: templates/core/_document_list_table.html:5 +#: wasa2il/templates/core/_document_list_table.html:5 msgid "Adopted?" msgstr "Aangenomen?" -#: templates/core/_document_list_table.html:6 +#: wasa2il/templates/core/_document_list_table.html:6 msgid "Original author" msgstr "Oorspronkelijke auteur" -#: templates/core/_document_list_table.html:7 +#: wasa2il/templates/core/_document_list_table.html:7 msgid "Contributors" msgstr "Medewerkers" -#: templates/core/_document_list_table.html:8 -#: templates/core/_document_proposals_list_table.html:5 +#: wasa2il/templates/core/_document_list_table.html:8 +#: wasa2il/templates/core/_document_proposals_list_table.html:5 msgid "Last edit" msgstr "Laatst bewerkt" -#: templates/core/_document_list_table.html:21 -#: templates/core/_document_proposals_list_table.html:17 +#: wasa2il/templates/core/_document_list_table.html:21 +#: wasa2il/templates/core/_document_proposals_list_table.html:17 msgid "There are no documents here!" msgstr "Er zijn hier geen documenten!" -#: templates/core/_document_proposals_list_table.html:6 +#: wasa2il/templates/core/_document_modal.html:6 +#, python-format +msgid "New %(type_name)s" +msgstr "" + +#: wasa2il/templates/core/_document_modal.html:11 +msgid "Choose a document to reference" +msgstr "" + +#: wasa2il/templates/core/_document_modal.html:22 +msgid "Write assumption:" +msgstr "Write assumption:" + +#: wasa2il/templates/core/_document_modal.html:41 +#, fuzzy +msgid "Statements:" +msgstr "Save statement" + +#: wasa2il/templates/core/_document_modal.html:49 +#: wasa2il/templates/core/polity_detail.html:148 +#: wasa2il/templates/core/topic_detail.html:72 +#: wasa2il/templates/forum/forum_detail.html:48 +msgid "Close" +msgstr "Close" + +#: wasa2il/templates/core/_document_modal.html:50 +#, python-format +msgid "Save %(type_name)s" +msgstr "" + +#: wasa2il/templates/core/_document_proposals_list_table.html:6 #, fuzzy msgid "Actions" msgstr "Veronderstellingen" -#: templates/core/_document_proposals_list_table.html:12 +#: wasa2il/templates/core/_document_proposals_list_table.html:12 #, fuzzy msgid "Propose" msgstr "Voorgesteld?" -#: templates/core/_documentsMenu.html:5 +#: wasa2il/templates/core/_documentsMenu.html:5 msgid "Your Documents" msgstr "Uw Documenten" -#: templates/core/_documentsMenu.html:19 +#: wasa2il/templates/core/_documentsMenu.html:19 msgid "Proposed Documents" msgstr "Voorgestelde Documenten" -#: templates/core/_documentsMenu.html:33 +#: wasa2il/templates/core/_documentsMenu.html:33 msgid "Adopted documents" msgstr "Aangenomen Documenten" -#: templates/core/_election_candidate_list.html:12 -msgid "Drag candidates here." +#: wasa2il/templates/core/_election_candidate_list.html:23 +#: wasa2il/templates/core/issue_detail.html:77 +#, fuzzy +msgid "Vote" +msgstr "Votes" + +#: wasa2il/templates/core/_election_candidate_list.html:34 +msgid "Your ballot is empty." +msgstr "" + +#: wasa2il/templates/core/_election_candidate_list.html:35 +msgid "Drag candidates here or click the vote buttons." msgstr "" -#: templates/core/_election_candidate_list.html:14 +#: wasa2il/templates/core/_election_candidate_list.html:38 +msgid "You have selected all the candidates, good work!" +msgstr "" + +#: wasa2il/templates/core/_election_candidate_list.html:40 #, fuzzy msgid "There are no candidates standing in this election yet!" msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" -#: templates/core/_politiesMenu.html:4 -msgid "Your Polities" -msgstr "Uw Beslissingsgroepen" +#: wasa2il/templates/core/_election_list_table.html:8 +#, fuzzy +msgid "You have voted in this election" +msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" + +#: wasa2il/templates/core/_election_list_table.html:8 +#, fuzzy +msgid "You have not voted in this election" +msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" -#: templates/core/_politiesMenu.html:18 -msgid "Other Polities" -msgstr "Andere Beslissingsgroepen" +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +#: wasa2il/templates/core/topic_detail.html:34 +#, fuzzy +msgid "Voting" +msgstr "Stemming onderwerpen" + +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +#: wasa2il/templates/core/topic_detail.html:34 +msgid "Open" +msgstr "" -#: templates/core/_topic_list_table.html:17 +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/topic_detail.html:34 +#, fuzzy +msgid "Closed" +msgstr "Close" + +#: wasa2il/templates/core/_election_list_table.html:18 +msgid "No elections are scheduled at the moment." +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:8 +#: wasa2il/templates/core/election_form.html:28 +#, fuzzy +msgid "New election" +msgstr "Nieuwe vergadering" + +#: wasa2il/templates/core/_polity_detail_elections.html:13 +msgid "Show closed elections" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:14 +msgid "Show all elections" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +#: wasa2il/templates/core/polity_detail.html:25 +#, fuzzy +msgid "Elections" +msgstr "Veronderstellingen" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +msgid "putting people in power" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:20 +msgid "Sometimes you need to put people in their places. Elections do just that." +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:25 +#: wasa2il/templates/core/election_list.html:15 +#, fuzzy +msgid "Election" +msgstr "Veronderstellingen" + +#: wasa2il/templates/core/_polity_detail_elections.html:26 +#: wasa2il/templates/core/election_list.html:16 +#: wasa2il/templates/core/issues_new.html:19 +#: wasa2il/templates/core/polity_detail.html:48 +#: wasa2il/templates/core/topic_detail.html:22 +msgid "State" +msgstr "State" + +#: wasa2il/templates/core/_polity_detail_elections.html:27 +#: wasa2il/templates/core/election_detail.html:91 +#: wasa2il/templates/core/election_detail.html:172 +#: wasa2il/templates/core/election_list.html:17 +msgid "Candidates" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:28 +#: wasa2il/templates/core/election_detail.html:89 +#: wasa2il/templates/core/election_detail.html:148 +#: wasa2il/templates/core/election_list.html:18 +#: wasa2il/templates/core/issue_detail.html:42 +#: wasa2il/templates/core/issues_new.html:21 +#: wasa2il/templates/core/polity_detail.html:50 +#: wasa2il/templates/core/topic_detail.html:24 +msgid "Votes" +msgstr "Votes" + +#: wasa2il/templates/core/_topic_list_table.html:19 msgid "There are no topics in this polity!" msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" -#: templates/core/delegate_detail.html:6 -#: templates/core/document_detail.html:14 -#: templates/core/election_detail.html:6 templates/core/issue_detail.html:6 -#: templates/core/meeting_detail.html:16 templates/core/topic_detail.html:7 -#: templates/forum/discussion_detail.html:6 -#: templates/forum/forum_detail.html:7 +#: wasa2il/templates/core/_topic_list_table.html:20 +msgid "Start a new topic" +msgstr "" + +#: wasa2il/templates/core/delegate_detail.html:6 +#: wasa2il/templates/core/document_detail.html:14 +#: wasa2il/templates/core/election_detail.html:31 +#: wasa2il/templates/core/election_list.html:8 +#: wasa2il/templates/core/issue_detail.html:6 +#: wasa2il/templates/core/issues_new.html:8 +#: wasa2il/templates/core/topic_detail.html:7 +#: wasa2il/templates/forum/discussion_detail.html:6 +#: wasa2il/templates/forum/forum_detail.html:7 msgid "Back to polity" msgstr "Terug naar beslissingsgroep" -#: templates/core/delegate_detail.html:8 +#: wasa2il/templates/core/delegate_detail.html:8 #, fuzzy msgid "Delegation:" msgstr "Verklaringen" -#: templates/core/delegate_detail.html:8 +#: wasa2il/templates/core/delegate_detail.html:8 msgid "to" msgstr "" -#: templates/core/delegate_detail.html:13 +#: wasa2il/templates/core/delegate_detail.html:13 #, fuzzy msgid "Stop delegating" msgstr "Start meeting" -#: templates/core/delegate_detail.html:14 +#: wasa2il/templates/core/delegate_detail.html:14 msgid "Change delegation" msgstr "" -#: templates/core/delegate_detail.html:33 +#: wasa2il/templates/core/delegate_detail.html:33 msgid "Delegation type" msgstr "" -#: templates/core/delegate_detail.html:37 +#: wasa2il/templates/core/delegate_detail.html:37 #, fuzzy msgid "Delegated item" msgstr "Next agenda item" -#: templates/core/delegate_detail.html:41 +#: wasa2il/templates/core/delegate_detail.html:41 #, fuzzy msgid "Delegated to user" msgstr "Related to issue:" -#: templates/core/delegate_detail.html:45 +#: wasa2il/templates/core/delegate_detail.html:45 msgid "Resulting delegation" msgstr "" -#: templates/core/delegate_detail.html:54 +#: wasa2il/templates/core/delegate_detail.html:54 msgid "Pathway breakdown" msgstr "" -#: templates/core/document_detail.html:8 templates/core/document_update.html:8 +#: wasa2il/templates/core/document_detail.html:8 msgid "Withdraw proposal" msgstr "Withdraw proposal" -#: templates/core/document_detail.html:10 -#: templates/core/document_update.html:10 +#: wasa2il/templates/core/document_detail.html:10 msgid "Propose this document" msgstr "Propose this document" -#: templates/core/document_detail.html:13 +#: wasa2il/templates/core/document_detail.html:13 msgid "Edit this document" msgstr "Dit document bewerken" -#: templates/core/document_detail.html:22 +#: wasa2il/templates/core/document_detail.html:22 msgid "Assumptions" msgstr "Veronderstellingen" -#: templates/core/document_detail.html:36 +#: wasa2il/templates/core/document_detail.html:36 msgid "Declarations" msgstr "Verklaringen" -#: templates/core/document_form.html:4 +#: wasa2il/templates/core/document_form.html:6 msgid "New Document" msgstr "Nieuw Document" -#: templates/core/document_form.html:6 +#: wasa2il/templates/core/document_form.html:9 msgid "In polity:" msgstr "In beslissingsgroep:" -#: templates/core/document_form.html:9 -msgid "Related to issues:" -msgstr "Gerelateerd aan onderwerpen:" - -#: templates/core/document_form.html:9 -msgid "Related to issue:" -msgstr "Related to issue:" - -#: templates/core/document_form.html:22 templates/core/issue_form.html:12 -#: templates/forum/discussion_form.html:16 templates/forum/forum_form.html:17 -msgid "Save" -msgstr "Save" - -#: templates/core/document_list.html:7 templates/core/issue_detail.html:53 -#: templates/core/polity_detail.html:294 +#: wasa2il/templates/core/document_list.html:7 +#: wasa2il/templates/core/polity_detail.html:83 msgid "New document" msgstr "New document" -#: templates/core/document_list.html:10 templates/core/issue_detail.html:56 -#: templates/core/polity_detail.html:113 templates/core/polity_list.html:17 -#: templates/core/topic_detail.html:30 -msgid "Documents" -msgstr "Documents" +#: wasa2il/templates/core/document_update.html:15 +msgid "Change proposal must differ from its predecessor." +msgstr "" -#: templates/core/document_update.html:15 +#: wasa2il/templates/core/document_update.html:88 msgid "Agreement" msgstr "Agreement" -#: templates/core/document_update.html:16 +#: wasa2il/templates/core/document_update.html:90 +#: wasa2il/templates/core/issue_detail.html:22 msgid "Proposal" msgstr "Proposal" -#: templates/core/document_update.html:17 -msgid "Draft proposal:" -msgstr "Draft proposal:" - -#: templates/core/document_update.html:48 -msgid "Referenced by issues" -msgstr "Referenced by issues" - -#: templates/core/document_update.html:56 -msgid "Contributors to this document" -msgstr "Contributors to this document" - -#: templates/core/document_update.html:65 -#: templates/core/meeting_detail.html:36 -#: templates/core/meeting_detail.html:101 -msgid "Add" -msgstr "Add" - -#: templates/core/document_update.html:73 -#: templates/core/document_update.html:132 -msgid "New reference" -msgstr "New reference" - -#: templates/core/document_update.html:74 -#: templates/core/document_update.html:154 -msgid "New assumption" -msgstr "New assumption" - -#: templates/core/document_update.html:75 -#: templates/core/document_update.html:172 -msgid "New statement" -msgstr "New statement" - -#: templates/core/document_update.html:76 -#: templates/core/document_update.html:189 -msgid "New subheading" -msgstr "New subheading" +#: wasa2il/templates/core/document_update.html:115 +#: wasa2il/templates/core/document_update.html:192 +#: wasa2il/templates/core/issues_new.html:20 +#: wasa2il/templates/core/polity_detail.html:49 +#: wasa2il/templates/core/topic_detail.html:23 +msgid "Comments" +msgstr "Comments" -#: templates/core/document_update.html:77 -msgid "Import structure" +#: wasa2il/templates/core/document_update.html:115 +msgid "optional" msgstr "" -#: templates/core/document_update.html:82 -#: templates/core/document_update.html:89 -msgid "Please note:" +#: wasa2il/templates/core/document_update.html:120 +msgid "Preview" msgstr "" -#: templates/core/document_update.html:83 -msgid "This document has been proposed." +#: wasa2il/templates/core/document_update.html:123 +msgid "Preview is required before saving" msgstr "" -#: templates/core/document_update.html:84 -msgid "" -"Changes you make to it now will become change proposals, which will be voted " -"on individually." -msgstr "" +#: wasa2il/templates/core/document_update.html:127 +#: wasa2il/templates/core/document_update.html:129 +#: wasa2il/templates/registration/password_change_form.html:20 +msgid "Cancel" +msgstr "Annuleren" -#: templates/core/document_update.html:90 -msgid "This document has been adopted." +#: wasa2il/templates/core/document_update.html:136 +msgid "Propose change" msgstr "" -#: templates/core/document_update.html:91 -msgid "" -"In order to make change proposals to it, you must import it into a new open " -"issue." +#: wasa2il/templates/core/document_update.html:141 +#: wasa2il/templates/core/document_update.html:143 +msgid "Edit proposal" msgstr "" -#: templates/core/document_update.html:100 -#, fuzzy -msgid "Change proposals" -msgstr "Withdraw proposal" - -#: templates/core/document_update.html:105 -#, fuzzy -msgid "Deleted" -msgstr "Delete" - -#: templates/core/document_update.html:108 -msgid "Moved" +#: wasa2il/templates/core/document_update.html:149 +#: wasa2il/templates/core/document_update.html:151 +msgid "Put to vote" msgstr "" -#: templates/core/document_update.html:115 -msgid "Added at beginning" +#: wasa2il/templates/core/document_update.html:170 +msgid "Referenced issue" msgstr "" -#: templates/core/document_update.html:117 -msgid "Added after:" +#: wasa2il/templates/core/document_update.html:186 +msgid "Versions" msgstr "" -#: templates/core/document_update.html:135 -msgid "Choose a document to reference:" -msgstr "Choose a document to reference:" - -#: templates/core/document_update.html:145 -#: templates/core/document_update.html:163 -#: templates/core/document_update.html:180 -#: templates/core/document_update.html:197 -#: templates/core/document_update.html:215 -#: templates/core/issue_detail.html:117 templates/core/polity_detail.html:327 -#: templates/core/polity_detail.html:363 templates/core/topic_detail.html:87 -#: templates/forum/forum_detail.html:48 -msgid "Close" -msgstr "Close" - -#: templates/core/document_update.html:146 -msgid "Save reference" -msgstr "Save reference" - -#: templates/core/document_update.html:157 -msgid "Write assumption:" -msgstr "Write assumption:" - -#: templates/core/document_update.html:164 -msgid "Save assumption" -msgstr "Save assumption" - -#: templates/core/document_update.html:181 -msgid "Save statement" -msgstr "Save statement" - -#: templates/core/document_update.html:198 -msgid "Save subheading" -msgstr "Save subheading" - -#: templates/core/document_update.html:206 -#, fuzzy -msgid "Import statements" -msgstr "New statement" - -#: templates/core/document_update.html:209 -#, fuzzy -msgid "Statements:" -msgstr "Save statement" - -#: templates/core/document_update.html:216 -#, fuzzy -msgid "Import" -msgstr "Ondersteuning" - -#: templates/core/document_update.html:228 -#, fuzzy -msgid "Add reference" -msgstr "New reference" - -#: templates/core/document_update.html:229 -#, fuzzy -msgid "Add assumption" -msgstr "Veronderstellingen" - -#: templates/core/document_update.html:231 -#, fuzzy -msgid "Add statement" -msgstr "New statement" +#: wasa2il/templates/core/document_update.html:190 +msgid "Status" +msgstr "Status" -#: templates/core/document_update.html:232 -#, fuzzy -msgid "Add subheading" -msgstr "New subheading" +#: wasa2il/templates/core/document_update.html:191 +msgid "Author" +msgstr "" -#: templates/core/document_update.html:238 -msgid "Delete" -msgstr "Delete" +#: wasa2il/templates/core/document_update.html:210 +msgid "New draft" +msgstr "" -#: templates/core/election_detail.html:8 +#: wasa2il/templates/core/election_detail.html:33 #, fuzzy msgid "Election:" msgstr "Verklaringen" -#: templates/core/election_detail.html:11 +#: wasa2il/templates/core/election_detail.html:36 #, fuzzy msgid "This election is closed." msgstr "This meeting is ongoing." -#: templates/core/election_detail.html:15 -#, fuzzy -msgid "This election is delegated." -msgstr "Deze beslissingsgroep heeft geen overeenkomsten." - -#: templates/core/election_detail.html:15 templates/core/issue_detail.html:15 -#: templates/core/polity_detail.html:31 templates/core/topic_detail.html:15 -msgid "View details." -msgstr "" - -#: templates/core/election_detail.html:23 -#, fuzzy -msgid "Deadline for candidacy:" -msgstr "Draft proposal:" - -#: templates/core/election_detail.html:24 templates/core/issue_detail.html:26 -msgid "Deadline for votes:" +#: wasa2il/templates/core/election_detail.html:39 +msgid "You cannot vote in this election:" msgstr "" -#: templates/core/election_detail.html:25 templates/core/issue_detail.html:29 -#, fuzzy -msgid "Votes:" -msgstr "Votes" - -#: templates/core/election_detail.html:26 -msgid "Candidates:" +#: wasa2il/templates/core/election_detail.html:41 +#: wasa2il/templates/core/election_detail.html:54 +msgid "Please log in." msgstr "" -#: templates/core/election_detail.html:27 -#, fuzzy -msgid "Voting system:" -msgstr "Stemming onderwerpen" - -#: templates/core/election_detail.html:39 -#: templates/core/polity_detail.html:159 -msgid "Candidates" +#: wasa2il/templates/core/election_detail.html:43 +msgid "You joined the organization too late." msgstr "" -#: templates/core/election_detail.html:39 -msgid "running in this election" +#: wasa2il/templates/core/election_detail.html:45 +#: wasa2il/templates/core/election_detail.html:56 +msgid "You are not a member of this polity." msgstr "" -#: templates/core/election_detail.html:50 templates/core/issue_detail.html:38 -#, fuzzy -msgid "Vote" -msgstr "Votes" - -#: templates/core/election_detail.html:50 -msgid "for the candidates standing in this election" -msgstr "" - -#: templates/core/election_detail.html:51 templates/core/issue_detail.html:39 -msgid "There was an error while processing your vote. Please try again." +#: wasa2il/templates/core/election_detail.html:47 +#: wasa2il/templates/core/election_detail.html:58 +msgid "You do not meet the requirements." msgstr "" -#: templates/core/issue_detail.html:11 -msgid "This issue is closed." +#: wasa2il/templates/core/election_detail.html:52 +msgid "You cannot run in this election:" msgstr "" -#: templates/core/issue_detail.html:15 -msgid "This issue is delegated." -msgstr "" - -#: templates/core/issue_detail.html:23 -#, fuzzy -msgid "In topics:" -msgstr "onderwerpen" - -#: templates/core/issue_detail.html:25 +#: wasa2il/templates/core/election_detail.html:65 #, fuzzy -msgid "Deadline for proposals:" -msgstr "Draft proposal:" +msgid "This election is delegated." +msgstr "Deze beslissingsgroep heeft geen overeenkomsten." -#: templates/core/issue_detail.html:30 -msgid "Yes:" +#: wasa2il/templates/core/election_detail.html:65 +#: wasa2il/templates/core/topic_detail.html:12 +msgid "View details." msgstr "" -#: templates/core/issue_detail.html:31 -msgid "No:" +#: wasa2il/templates/core/election_detail.html:73 +msgid "Voting begins" msgstr "" -#: templates/core/issue_detail.html:38 -msgid "for or against the documents in this issue" +#: wasa2il/templates/core/election_detail.html:80 +msgid "Candidacy polities" msgstr "" -#: templates/core/issue_detail.html:41 -msgid "Yes" +#: wasa2il/templates/core/election_detail.html:81 +msgid "You can run" msgstr "" -#: templates/core/issue_detail.html:42 -msgid "Abstain" +#: wasa2il/templates/core/election_detail.html:85 +msgid "Voting polities" msgstr "" -#: templates/core/issue_detail.html:43 -msgid "No" +#: wasa2il/templates/core/election_detail.html:86 +msgid "You can vote" msgstr "" -#: templates/core/issue_detail.html:45 -#, fuzzy -msgid "Voting closes in" -msgstr "Stemming onderwerpen" - -#: templates/core/issue_detail.html:52 templates/core/issue_detail.html:103 -#, fuzzy -msgid "Import agreement" -msgstr "Agreement" - -#: templates/core/issue_detail.html:56 -msgid "proposed or in progress" -msgstr "proposed or in progress" - -#: templates/core/issue_detail.html:57 -msgid "" -"Documents are structured texts which contain the laws of the polity, or " -"proposals for such laws." +#: wasa2il/templates/core/election_detail.html:95 +msgid "Details ..." msgstr "" -"Documents are structured texts which contain the laws of the polity, or " -"proposals for such laws." -#: templates/core/issue_detail.html:58 -#, fuzzy -msgid "Proposed documents" -msgstr "Voorgestelde Documenten" - -#: templates/core/issue_detail.html:67 -msgid "Documents you are working on that haven't been proposed:" +#: wasa2il/templates/core/election_detail.html:105 +#: wasa2il/templates/core/election_detail.html:154 +msgid "About This Election" msgstr "" -#: templates/core/issue_detail.html:78 -#: templates/forum/discussion_detail.html:9 -msgid "Discussion" -msgstr "Discussion" - -#: templates/core/issue_detail.html:85 -#: templates/forum/discussion_detail.html:23 -msgid "Add comment" -msgstr "Add comment" - -#: templates/core/issue_detail.html:106 -#, fuzzy -msgid "Choose an agreement to import:" -msgstr "Choose a document to reference:" - -#: templates/core/issue_detail.html:114 -msgid "" -"The purpose of importing an agreement to an issue is to be able to propose " -"changes to it." -msgstr "" - -#: templates/core/issue_detail.html:118 -msgid "Import document to issue" -msgstr "" - -#: templates/core/issue_form.html:5 templates/core/polity_detail.html:72 -#: templates/core/topic_detail.html:9 -msgid "New issue" -msgstr "New issue" - -#: templates/core/meeting_detail.html:21 -msgid "Attendance list" -msgstr "Attendance list" - -#: templates/core/meeting_detail.html:23 -msgid "Attend meeting" -msgstr "Attend meeting" - -#: templates/core/meeting_detail.html:25 -msgid "You can sign in to attendance when the meeting has started." -msgstr "You can sign in to attendance when the meeting has started." - -#: templates/core/meeting_detail.html:29 -msgid "Meeting managers" -msgstr "Meeting managers" - -#: templates/core/meeting_detail.html:41 -msgid "This meeting will start in" -msgstr "This meeting will start in" - -#: templates/core/meeting_detail.html:42 -msgid "This meeting is ongoing." -msgstr "This meeting is ongoing." - -#: templates/core/meeting_detail.html:43 -msgid "This meeting ended at" -msgstr "This meeting ended at" - -#: templates/core/meeting_detail.html:51 -msgid "Ajourn meeting" -msgstr "Ajourn meeting" - -#: templates/core/meeting_detail.html:52 -msgid "Start meeting" -msgstr "Start meeting" - -#: templates/core/meeting_detail.html:57 -msgid "Close agenda" -msgstr "Close agenda" - -#: templates/core/meeting_detail.html:60 -msgid "Open agenda" -msgstr "Open agenda" - -#: templates/core/meeting_detail.html:67 -msgid "Previous agenda item" -msgstr "Previous agenda item" - -#: templates/core/meeting_detail.html:68 -msgid "Next agenda item" -msgstr "Next agenda item" - -#: templates/core/meeting_detail.html:69 -msgid "Previous speaker" -msgstr "Previous speaker" - -#: templates/core/meeting_detail.html:70 -msgid "Next speaker" -msgstr "Next speaker" - -#: templates/core/meeting_detail.html:71 -#, fuzzy -msgid "Add speaker" -msgstr "Next speaker" - -#: templates/core/meeting_detail.html:79 -msgid "Want to talk" -msgstr "Wil praten" - -#: templates/core/meeting_detail.html:80 -msgid "Direct response" -msgstr "Directe reactie" - -#: templates/core/meeting_detail.html:82 -msgid "Clarify" -msgstr "Verduidelijken" - -#: templates/core/meeting_detail.html:83 -msgid "Point of order" -msgstr "Motie van orde" - -#: templates/core/meeting_detail.html:89 -msgid "Who?" -msgstr "" - -#: templates/core/meeting_detail.html:100 -msgid "Agenda item title" -msgstr "Agendapunt titel" - -#: templates/core/meeting_detail.html:102 -msgid "Cancel" -msgstr "Annuleren" - -#: templates/core/meeting_detail.html:120 -msgid "Start meeting early?" -msgstr "Vergadering vroeg starten?" - -#: templates/core/meeting_detail.html:123 -msgid "The meeting is scheduled to start at " -msgstr "De vergadering is gepland om te beginnen om" - -#: templates/core/meeting_detail.html:124 -msgid "Are you sure you want to start this meeting ahead of schedule?" -msgstr "Weet u zeker dat u deze vergadering wil beginnen voor aanvang" - -#: templates/core/meeting_detail.html:127 -msgid "No, don't start the meeting!" -msgstr "Nee, de vergadering niet starten!" - -#: templates/core/meeting_detail.html:128 -msgid "Yes, start the meeting." -msgstr "Ja, de vergadering starten." - -#: templates/core/polity_detail.html:8 -msgid "Leave polity" -msgstr "Verlaat de beslissingsgroep" - -#: templates/core/polity_detail.html:11 -msgid "Join polity" -msgstr "Neem deel aan de beslissingsgroep" - -#: templates/core/polity_detail.html:13 -msgid "Request to join polity" -msgstr "Verzoek om te deel te nemen aan de beslissingsgroep" - -#: templates/core/polity_detail.html:20 -#, fuzzy -msgid "You are an officer in this polity." -msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" - -#: templates/core/polity_detail.html:22 -#, fuzzy -msgid "You are a member of this polity." -msgstr "Leden van deze beslissingsgroep" - -#: templates/core/polity_detail.html:31 -#, fuzzy -msgid "This polity is delegated." -msgstr "Deze beslissingsgroep heeft geen overeenkomsten." - -#: templates/core/polity_detail.html:37 -msgid "Your request to join has been sent." -msgstr "Uw aanvraag om deel te nemen is verzonden." - -#: templates/core/polity_detail.html:39 -msgid "Your request to join this polity is still pending." -msgstr "" -"Uw verzoek tot deelname aan deze beslissingsgroep is nog in behandeling" - -#: templates/core/polity_detail.html:46 -msgid "members" -msgstr "leden" - -#: templates/core/polity_detail.html:47 -msgid "topics" -msgstr "onderwerpen" - -#: templates/core/polity_detail.html:48 -#, fuzzy -msgid "agreements" -msgstr "Overeenkomsten" - -#: templates/core/polity_detail.html:49 -msgid "subpolities" -msgstr "subdeelnamegroepen" - -#: templates/core/polity_detail.html:54 templates/core/polity_detail.html:56 -msgid "membership requests" -msgstr "lidmaatschapsaanvragen" - -#: templates/core/polity_detail.html:61 -msgid "You have" -msgstr "" - -#: templates/core/polity_detail.html:61 -#, fuzzy -msgid "delegations" -msgstr "Verklaringen" - -#: templates/core/polity_detail.html:75 -msgid "Show only starred topics" -msgstr "Toon alleen onderwerpen met een ster" - -#: templates/core/polity_detail.html:76 -msgid "New topic" -msgstr "Nieuw onderwerp" - -#: templates/core/polity_detail.html:81 templates/core/polity_detail.html:88 -#: templates/core/polity_list.html:16 -msgid "Topics" -msgstr "Onderwerpen" - -#: templates/core/polity_detail.html:81 -msgid "of discussion" -msgstr "van discussie" - -#: templates/core/polity_detail.html:83 -msgid "Topics are thematic categories that contain specific issues." -msgstr "Onderwerpen zijn thematische categorien met daarin specifieke" - -#: templates/core/polity_detail.html:89 templates/core/topic_detail.html:28 -msgid "Issues" -msgstr "Onderwerpen" - -#: templates/core/polity_detail.html:90 -msgid "Open Issues" -msgstr "Open onderwerpen" - -#: templates/core/polity_detail.html:91 -msgid "Voting Issues" -msgstr "Stemming onderwerpen" - -#: templates/core/polity_detail.html:104 -#, fuzzy -msgid "New issues" -msgstr "New issue" - -#: templates/core/polity_detail.html:104 -#, fuzzy -msgid "in discussion" -msgstr "van discussie" - -#: templates/core/polity_detail.html:106 -#, fuzzy -msgid "These are the newest issues being discussed in this polity." -msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" - -#: templates/core/polity_detail.html:112 templates/core/polity_detail.html:158 -#: templates/core/topic_detail.html:29 -msgid "State" -msgstr "State" - -#: templates/core/polity_detail.html:114 templates/core/topic_detail.html:31 -msgid "Comments" -msgstr "Comments" - -#: templates/core/polity_detail.html:115 templates/core/polity_detail.html:160 -#: templates/core/topic_detail.html:32 -msgid "Votes" -msgstr "Votes" - -#: templates/core/polity_detail.html:123 templates/core/topic_detail.html:38 -msgid "You have voted on this issue" +#: wasa2il/templates/core/election_detail.html:114 +msgid "Election results" msgstr "" -#: templates/core/polity_detail.html:123 templates/core/topic_detail.html:38 -msgid "You have not voted on this issue" +#: wasa2il/templates/core/election_detail.html:130 +msgid "No votes were cast." msgstr "" -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -#, fuzzy -msgid "Voting" -msgstr "Stemming onderwerpen" +#: wasa2il/templates/core/election_detail.html:134 +msgid "Votes are still being counted." +msgstr "" -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -msgid "Open" +#: wasa2il/templates/core/election_detail.html:148 +msgid "your favorites first!" msgstr "" -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -#, fuzzy -msgid "Closed" -msgstr "Close" +#: wasa2il/templates/core/election_detail.html:157 +msgid "How To Vote" +msgstr "" -#: templates/core/polity_detail.html:141 -#, fuzzy -msgid "New election" -msgstr "Nieuwe vergadering" +#: wasa2il/templates/core/election_detail.html:159 +msgid "Click the Start Voting button to begin" +msgstr "" -#: templates/core/polity_detail.html:145 -#, fuzzy -msgid "Closed elections" -msgstr "Verklaringen" +#: wasa2il/templates/core/election_detail.html:160 +msgid "Click a Vote button to vote for a candidate" +msgstr "" -#: templates/core/polity_detail.html:150 -#, fuzzy -msgid "Elections" -msgstr "Veronderstellingen" +#: wasa2il/templates/core/election_detail.html:161 +msgid "Click the arrows to move your favorite candidates to the top" +msgstr "" -#: templates/core/polity_detail.html:150 -msgid "putting people in power" +#: wasa2il/templates/core/election_detail.html:162 +msgid "Your vote will be counted when the deadline has passed" msgstr "" -#: templates/core/polity_detail.html:152 -msgid "" -"Sometimes you need to put people in their places. Elections do just that." +#: wasa2il/templates/core/election_detail.html:165 +msgid "Start Voting" msgstr "" -#: templates/core/polity_detail.html:157 -#, fuzzy -msgid "Election" -msgstr "Veronderstellingen" +#: wasa2il/templates/core/election_detail.html:172 +msgid "running in this election" +msgstr "" -#: templates/core/polity_detail.html:168 -#, fuzzy -msgid "You have voted in this election" -msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" +#: wasa2il/templates/core/election_detail.html:177 +msgid "Announce candidacy" +msgstr "" -#: templates/core/polity_detail.html:168 -#, fuzzy -msgid "You have not voted in this election" -msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" +#: wasa2il/templates/core/election_detail.html:180 +msgid "Are you sure you want to withdraw? This can not be undone." +msgstr "" -#: templates/core/polity_detail.html:184 -msgid "New meeting" -msgstr "Nieuwe vergadering" +#: wasa2il/templates/core/election_detail.html:182 +msgid "Withdraw candidacy" +msgstr "" -#: templates/core/polity_detail.html:187 templates/core/polity_detail.html:230 -msgid "Show ongoing meetings" -msgstr "Toon lopende vergaderingen" +#: wasa2il/templates/core/election_list.html:10 +msgid "Elections in polity" +msgstr "" -#: templates/core/polity_detail.html:188 templates/core/polity_detail.html:231 -msgid "Show upcoming meetings" -msgstr "Toekomstige vergaderingen weergeven" +#: wasa2il/templates/core/issue_detail.html:24 +msgid "In topics" +msgstr "" -#: templates/core/polity_detail.html:189 templates/core/polity_detail.html:232 -msgid "Show finished meetings" -msgstr "Afgewerkte vergaderingen weergeven" +#: wasa2il/templates/core/issue_detail.html:27 +msgid "Start time" +msgstr "" -#: templates/core/polity_detail.html:193 -msgid "Meetings" -msgstr "Vergaderingen" +#: wasa2il/templates/core/issue_detail.html:29 +msgid "Deadline for discussion" +msgstr "" -#: templates/core/polity_detail.html:193 -msgid "physical or virtual" -msgstr "fysieke of virtuele" +#: wasa2il/templates/core/issue_detail.html:32 +msgid "Deadline for proposals" +msgstr "" -#: templates/core/polity_detail.html:195 -msgid "" -"A meeting is an event where people come together to discuss a set of agenda " -"items." +#: wasa2il/templates/core/issue_detail.html:53 +msgid "Majority threshold" msgstr "" -"Een vergadering is een evenement waar mensen samenkomen om te discussiëren " -"over een reeks van de agendapunten." -#: templates/core/polity_detail.html:199 -msgid "When" -msgstr "Wanneer" +#: wasa2il/templates/core/issue_detail.html:57 +#: wasa2il/templates/forum/discussion_detail.html:9 +msgid "Discussion" +msgstr "Discussion" + +#: wasa2il/templates/core/issue_detail.html:68 +#: wasa2il/templates/forum/discussion_detail.html:23 +msgid "Add comment" +msgstr "Add comment" -#: templates/core/polity_detail.html:200 -msgid "Where" -msgstr "Waar" +#: wasa2il/templates/core/issue_detail.html:77 +msgid "for or against this issue" +msgstr "" -#: templates/core/polity_detail.html:201 -msgid "Organized by" -msgstr "Georganiseerd door" +#: wasa2il/templates/core/issue_form.html:8 +msgid "version" +msgstr "" -#: templates/core/polity_detail.html:202 -msgid "Status" -msgstr "Status" +#: wasa2il/templates/core/issue_form.html:22 +msgid "New issue" +msgstr "New issue" -#: templates/core/polity_detail.html:227 +#: wasa2il/templates/core/issues_new.html:10 +#: wasa2il/templates/core/polity_detail.html:22 +#: wasa2il/templates/core/polity_detail.html:40 #, fuzzy -msgid "New delegation" -msgstr "Nieuwe vergadering" +msgid "New issues" +msgstr "New issue" -#: templates/core/polity_detail.html:236 +#: wasa2il/templates/core/issues_new.html:10 +#: wasa2il/templates/core/polity_detail.html:40 #, fuzzy -msgid "Delegations" -msgstr "Verklaringen" +msgid "in discussion" +msgstr "van discussie" -#: templates/core/polity_detail.html:236 -msgid "votes entrusted to others" -msgstr "" +#: wasa2il/templates/core/issues_new.html:11 +#: wasa2il/templates/core/polity_detail.html:42 +#, fuzzy +msgid "These are the newest issues being discussed in this polity." +msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" -#: templates/core/polity_detail.html:238 -msgid "You can set up delgations for the polity, for topics, or for issues." +#: wasa2il/templates/core/issues_new.html:29 +#: wasa2il/templates/core/polity_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:30 +msgid "You have voted on this issue" msgstr "" -#: templates/core/polity_detail.html:239 -msgid "Here you can see all of your active delegations and where they lead to." +#: wasa2il/templates/core/issues_new.html:29 +#: wasa2il/templates/core/polity_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:30 +msgid "You have not voted on this issue" msgstr "" -#: templates/core/polity_detail.html:249 -msgid "Subpolities" -msgstr "Subbeslissingsgroepen" - -#: templates/core/polity_detail.html:251 -msgid "" -"A polity can have subordinate organizational units, such as how a " -"municipality relates to a country." +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +msgid "New" msgstr "" -"Een beslissingsgroep kan ondergeschikte organisatorische eenheden hebben" -#: templates/core/polity_detail.html:265 -#: templates/forum/discussion_form.html:5 templates/forum/forum_form.html:5 +#: wasa2il/templates/core/polity_detail.html:9 #, fuzzy -msgid "New forum" -msgstr "Nieuw Document" +msgid "You are an officer in this polity." +msgstr "Er zijn geen onderwerpen in deze beslissingsgroep" -#: templates/core/polity_detail.html:268 +#: wasa2il/templates/core/polity_detail.html:11 #, fuzzy -msgid "Discussion Forums" -msgstr "Discussion" +msgid "You are a member of this polity." +msgstr "Leden van deze beslissingsgroep" -#: templates/core/polity_detail.html:270 -msgid "" -"Often it is important to have open-ended discussions on a range of topics " -"outside of particular issues." -msgstr "" +#: wasa2il/templates/core/polity_detail.html:23 +#: wasa2il/templates/core/polity_detail.html:86 +#: wasa2il/templates/help/is/agreement.html:6 +msgid "Agreements" +msgstr "Overeenkomsten" -#: templates/core/polity_detail.html:274 templates/forum/forum_detail.html:18 -msgid "Name" +#: wasa2il/templates/core/polity_detail.html:36 +msgid "Show all new issues" msgstr "" -#: templates/core/polity_detail.html:275 templates/forum/forum_detail.html:15 -#, fuzzy -msgid "Discussions" -msgstr "Discussion" - -#: templates/core/polity_detail.html:276 -msgid "Unseen posts" +#: wasa2il/templates/core/polity_detail.html:68 +msgid "There are no new issues at the moment." msgstr "" -#: templates/core/polity_detail.html:299 templates/help/agreement.html:6 -msgid "Agreements" -msgstr "Overeenkomsten" - -#: templates/core/polity_detail.html:299 +#: wasa2il/templates/core/polity_detail.html:86 msgid "of this polity" msgstr "van deze beslissingsgroep" -#: templates/core/polity_detail.html:301 +#: wasa2il/templates/core/polity_detail.html:88 msgid "Here are all of the agreements this polity has arrived at." msgstr "" -"Hier zijn alle overeenkomsten die door deze beslissingsgroep zijn gesloten. " +"Hier zijn alle overeenkomsten die door deze beslissingsgroep zijn " +"gesloten. " -#: templates/core/polity_detail.html:315 -msgid "Members of this polity" -msgstr "Leden van deze beslissingsgroep" +#: wasa2il/templates/core/polity_detail.html:99 +#: wasa2il/templates/core/topic_form.html:6 +msgid "New topic" +msgstr "Nieuw onderwerp" + +#: wasa2il/templates/core/polity_detail.html:103 +msgid "Show only starred topics" +msgstr "Toon alleen onderwerpen met een ster" -#: templates/core/polity_detail.html:335 -msgid "Users requesting membership" -msgstr "Gebruikers die lidmaatschap aanvragen" +#: wasa2il/templates/core/polity_detail.html:107 +msgid "of discussion" +msgstr "van discussie" -#: templates/core/polity_detail.html:371 -msgid "Leave this polity?" -msgstr "Deze beslissingsgroep verlaten?" +#: wasa2il/templates/core/polity_detail.html:109 +msgid "Topics are thematic categories that contain specific issues." +msgstr "Onderwerpen zijn thematische categorien met daarin specifieke" -#: templates/core/polity_detail.html:374 -msgid "Are you sure you want to stop being a member of this polity?" -msgstr "" -"Weet u zeker dat u niet langer deel wil nemen aan deze beslissingsgroep?" +#: wasa2il/templates/core/polity_detail.html:115 +#: wasa2il/templates/core/topic_detail.html:21 +msgid "Issues" +msgstr "Onderwerpen" -#: templates/core/polity_detail.html:376 -msgid "Only members get to participate in the polity's activities." -msgstr "" -"Alleen deelnemers kunnen deelnemen aan de activiteiten van deze " -"beslissingsgroep." +#: wasa2il/templates/core/polity_detail.html:116 +msgid "Open Issues" +msgstr "Open onderwerpen" -#: templates/core/polity_detail.html:380 -msgid "No, I hit that button by accident" -msgstr "No, I hit that button by accident" +#: wasa2il/templates/core/polity_detail.html:117 +msgid "Voting Issues" +msgstr "Stemming onderwerpen" -#: templates/core/polity_detail.html:381 -msgid "Yes, I want to leave this polity." -msgstr "Yes, I want to leave this polity." +#: wasa2il/templates/core/polity_detail.html:138 +msgid "Subpolities" +msgstr "Subbeslissingsgroepen" -#: templates/core/polity_list.html:7 +#: wasa2il/templates/core/polity_form.html:6 +#: wasa2il/templates/core/polity_list.html:8 msgid "New polity" msgstr "New polity" -#: templates/core/polity_list.html:10 templates/help/polity.html:6 +#: wasa2il/templates/core/polity_list.html:12 +#: wasa2il/templates/help/is/polity.html:6 msgid "Polities" msgstr "Polities" -#: templates/core/polity_list.html:15 -msgid "Members" -msgstr "Members" - -#: templates/core/topic_detail.html:15 +#: wasa2il/templates/core/topic_detail.html:12 msgid "This topic is delegated." msgstr "" -#: templates/core/topic_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:18 +msgid "List of issues" +msgstr "" + +#: wasa2il/templates/core/topic_detail.html:43 msgid "New discussions" msgstr "New discussions" -#: templates/core/topic_detail.html:75 +#: wasa2il/templates/core/topic_detail.html:48 +msgid "in" +msgstr "in" + +#: wasa2il/templates/core/topic_detail.html:60 #, fuzzy msgid "Followers of this topic" msgstr "Leden van deze beslissingsgroep" -#: templates/forum/discussion_detail.html:7 +#: wasa2il/templates/core/stub/document_view.html:14 +#: wasa2il/templates/core/stub/document_view.html:85 +msgid "Comparison" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:15 +msgid "Comparison in progress..." +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:84 +msgid "Text" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:89 +msgid "Compared to" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +msgid "predecessor" +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:9 +msgid "This proposal has been accepted by vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:11 +msgid "" +"This content is still merely a proposal and has not yet been accepted by " +"vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:13 +msgid "This proposal has been rejected by vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:15 +msgid "This proposal is deprecated. A newer version has taken effect." +msgstr "" + +#: wasa2il/templates/forum/discussion_detail.html:7 #, fuzzy msgid "Back to forum" msgstr "Terug naar boven" -#: templates/forum/discussion_detail.html:12 +#: wasa2il/templates/forum/discussion_detail.html:12 #, fuzzy msgid "This discussion is closed." msgstr "van discussie" -#: templates/forum/forum_detail.html:8 +#: wasa2il/templates/forum/discussion_form.html:5 +#: wasa2il/templates/forum/forum_form.html:5 +#, fuzzy +msgid "New forum" +msgstr "Nieuw Document" + +#: wasa2il/templates/forum/forum_detail.html:8 #, fuzzy msgid "New discussion" msgstr "New discussions" -#: templates/forum/forum_detail.html:10 +#: wasa2il/templates/forum/forum_detail.html:10 msgid "Forum:" msgstr "" -#: templates/forum/forum_detail.html:19 +#: wasa2il/templates/forum/forum_detail.html:15 +#, fuzzy +msgid "Discussions" +msgstr "Discussion" + +#: wasa2il/templates/forum/forum_detail.html:19 msgid "Messages" msgstr "" -#: templates/forum/forum_detail.html:20 +#: wasa2il/templates/forum/forum_detail.html:20 msgid "Participants" msgstr "" -#: templates/forum/forum_detail.html:36 +#: wasa2il/templates/forum/forum_detail.html:36 #, fuzzy msgid "Followers of this forum" msgstr "Leden van deze beslissingsgroep" -#: templates/forum/forum_form.html:16 +#: wasa2il/templates/forum/forum_form.html:16 msgid "Name:" msgstr "" -#: templates/help/agreement.html:8 +#: wasa2il/templates/help/is/agreement.html:61 #, fuzzy msgid "" "\n" "

            \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

            \n" "

            \n" "There's a lot of \"generally\" in there, because different polities do " @@ -1348,73 +1214,74 @@ msgid "" "

            \n" "

            Conditions of adoption

            \n" "

            \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

            \n" -"

            More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

            More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

            \n" -"

            A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

            A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

            \n" "

            Document structure

            \n" "

            \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

            \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
            \n" "\t

            0047/2010

            \n" "\t

            Written declaration on the establishment of " "European Home-Made Ice Cream Day

            \n" "\t

            The European Parliament,

            \n" -"\t

            —   having regard to Rule 123 of " -"its Rules of Procedure,

            \n" +"\t

            —   having regard to Rule 123 " +"of its Rules of Procedure,

            \n" "\t
              \n" "\t\t
            1. whereas the quality of food is a distinctive feature of European " "products and home-made ice cream is synonymous \n" "\t\twith quality as far as fresh dairy products are concerned,
            2. \n" -"\t\t
            3. whereas in some areas home-made ice cream is a typical food product " -"in the fresh dairy \n" +"\t\t
            4. whereas in some areas home-made ice cream is a typical food " +"product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
            5. \n" -"\t\t
            6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
            7. \n" +"\t\t
            8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
            9. \n" "\t
            \n" "\t
              \n" -"\t\t
            1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\t\t
            2. Calls on the Member States to support the quality product that is" +" home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
            3. \n" -"\t\t
            4. Considers it important, to that end, to establish European Home-Made " -"Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\t\t
            5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
            6. \n" +"\t\t
            7. Considers it important, to that end, to establish European Home-" +"Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
            8. \n" +"\t\t
            9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
            10. \n" "\t
            \n" "
            \n" "

            \n" @@ -1423,10 +1290,10 @@ msgstr "" "

            \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

            \n" "

            \n" "There's a lot of \"generally\" in there, because different polities do " @@ -1434,110 +1301,111 @@ msgstr "" "

            \n" "

            Conditions of adoption

            \n" "

            \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

            \n" -"

            More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

            More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

            \n" -"

            A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

            A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

            \n" "

            Document structure

            \n" "

            \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

            \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
            \n" "\\t

            0047/2010

            \n" "\\t

            Written declaration on the establishment of " "European Home-Made Ice Cream Day

            \n" "\\t

            The European Parliament,

            \n" -"\\t

            —   having regard to Rule 123 of " -"its Rules of Procedure,

            \n" +"\\t

            —   having regard to Rule 123" +" of its Rules of Procedure,

            \n" "\\t
              \n" -"\\t\\t
            1. whereas the quality of food is a distinctive feature of European " -"products and home-made ice cream is synonymous \n" +"\\t\\t
            2. whereas the quality of food is a distinctive feature of " +"European products and home-made ice cream is synonymous \n" "\\t\\twith quality as far as fresh dairy products are concerned,
            3. \n" "\\t\\t
            4. whereas in some areas home-made ice cream is a typical food " "product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
            5. \n" -"\\t\\t
            6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
            7. \n" +"\\t\\t
            8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
            9. \n" "\\t
            \n" "\\t
              \n" -"\\t\\t
            1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\\t\\t
            2. Calls on the Member States to support the quality product that " +"is home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
            3. \n" -"\\t\\t
            4. Considers it important, to that end, to establish European Home-" -"Made Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\\t\\t
            5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
            6. \n" +"\\t\\t
            7. Considers it important, to that end, to establish European " +"Home-Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
            8. \n" +"\\t\\t
            9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
            10. \n" "\\t
            \n" "
            \n" "

            \n" -#: templates/help/agreement.html:64 +#: wasa2il/templates/help/is/agreement.html:64 msgid "The title" msgstr "The title" -#: templates/help/agreement.html:64 +#: wasa2il/templates/help/is/agreement.html:64 msgid "" -"Agreements may have various forms of reference. One is a reference number, " -"which should be unique and cannonical. Another is a human readable title " -"that is descriptive. Some polities might choose not to use either one, but " -"rules around this should generally be decided on." +"Agreements may have various forms of reference. One is a reference " +"number, which should be unique and cannonical. Another is a human " +"readable title that is descriptive. Some polities might choose not to use" +" either one, but rules around this should generally be decided on." msgstr "" -"Agreements may have various forms of reference. One is a reference number, " -"which should be unique and cannonical. Another is a human readable title " -"that is descriptive. Some polities might choose not to use either one, but " -"rules around this should generally be decided on." +"Agreements may have various forms of reference. One is a reference " +"number, which should be unique and cannonical. Another is a human " +"readable title that is descriptive. Some polities might choose not to use" +" either one, but rules around this should generally be decided on." -#: templates/help/agreement.html:65 +#: wasa2il/templates/help/is/agreement.html:65 msgid "The polity" msgstr "The polity" -#: templates/help/agreement.html:65 +#: wasa2il/templates/help/is/agreement.html:65 msgid "" -"Many polities make sure that their agreements contain their name, so as not " -"to be confusing." +"Many polities make sure that their agreements contain their name, so as " +"not to be confusing." msgstr "" -"Many polities make sure that their agreements contain their name, so as not " -"to be confusing." +"Many polities make sure that their agreements contain their name, so as " +"not to be confusing." -#: templates/help/agreement.html:66 +#: wasa2il/templates/help/is/agreement.html:66 msgid "References section" msgstr "References section" -#: templates/help/agreement.html:66 +#: wasa2il/templates/help/is/agreement.html:66 msgid "" "In the references section, a polity may choose to include references to " "previous agreements, or articles in those agreements." @@ -1545,58 +1413,65 @@ msgstr "" "In the references section, a polity may choose to include references to " "previous agreements, or articles in those agreements." -#: templates/help/agreement.html:67 +#: wasa2il/templates/help/is/agreement.html:67 msgid "Assumptions section" msgstr "Assumptions section" -#: templates/help/agreement.html:67 +#: wasa2il/templates/help/is/agreement.html:67 msgid "" -"The assumptions section generally contains a list of assumptions that are " -"being made. Often these are factual references, or slightly more oblique " -"references to previous decisions. Sometimes they're bizzarre statements of " -"opinion, or even, if used incorrectly, declarations of their own right." -msgstr "" -"The assumptions section generally contains a list of assumptions that are " -"being made. Often these are factual references, or slightly more oblique " -"references to previous decisions. Sometimes they're bizzarre statements of " -"opinion, or even, if used incorrectly, declarations of their own right." - -#: templates/help/agreement.html:68 +"The assumptions section generally contains a list of assumptions that are" +" being made. Often these are factual references, or slightly more oblique" +" references to previous decisions. Sometimes they're bizzarre statements " +"of opinion, or even, if used incorrectly, declarations of their own " +"right." +msgstr "" +"The assumptions section generally contains a list of assumptions that are" +" being made. Often these are factual references, or slightly more oblique" +" references to previous decisions. Sometimes they're bizzarre statements " +"of opinion, or even, if used incorrectly, declarations of their own " +"right." + +#: wasa2il/templates/help/is/agreement.html:68 msgid "Declarations section" msgstr "Declarations section" -#: templates/help/agreement.html:68 +#: wasa2il/templates/help/is/agreement.html:68 msgid "" -"This is the meat of the agreement. It contains one or more statements which " -"are considered to be agreed upon by the polity when the document is adopted. " -"One might even call this the law." +"This is the meat of the agreement. It contains one or more statements " +"which are considered to be agreed upon by the polity when the document is" +" adopted. One might even call this the law." msgstr "" -"This is the meat of the agreement. It contains one or more statements which " -"are considered to be agreed upon by the polity when the document is adopted. " -"One might even call this the law." +"This is the meat of the agreement. It contains one or more statements " +"which are considered to be agreed upon by the polity when the document is" +" adopted. One might even call this the law." -#: templates/help/agreement.html:71 templates/help/polity.html:117 -#: templates/help/proposal.html:62 templates/help/wasa2il.html:28 +#: wasa2il/templates/help/is/agreement.html:71 +#: wasa2il/templates/help/is/polity.html:117 +#: wasa2il/templates/help/is/proposal.html:62 msgid "Related help pages" msgstr "Related help pages" -#: templates/help/agreement.html:73 +#: wasa2il/templates/help/is/agreement.html:73 msgid "How does one make a proposal?" msgstr "How does one make a proposal?" -#: templates/help/agreement.html:74 templates/help/index.html:13 -#: templates/help/polity.html:120 templates/help/proposal.html:65 -#: templates/help/wasa2il.html:30 +#: wasa2il/templates/help/is/agreement.html:74 +#: wasa2il/templates/help/is/index.html:13 +#: wasa2il/templates/help/is/polity.html:120 +#: wasa2il/templates/help/is/proposal.html:65 msgid "How does electronic democracy work?" msgstr "How does electronic democracy work?" -#: templates/help/authors.html:8 +#: wasa2il/templates/help/is/authors.html:50 msgid "" "\n" "

            Developers:

            \n" "
              \n" "
            • Smári McCarthy
            • \n" "
            • Tómas Árni Jónasson
            • \n" +"
            • Helgi Hrafn Gunnarsson
            • \n" +"
            • Björn Leví Gunnarsson
            • \n" +"
            • Bjarni Rúnar Einarsson
            • \n" "
            \n" "

            Contributors:

            \n" "
              \n" @@ -1605,6 +1480,10 @@ msgid "" "
            • Zineb Belmkaddem
            • \n" "
            • Þórgnýr Thoroddssen
            • \n" "
            • Stefán Vignir Skarphéðinsson
            • \n" +"
            • Jóhann Haukur Gunnarsson
            • \n" +"
            • Steinn Eldjárn Sigurðarson
            • \n" +"
            • Björgvin Ragnarsson
            • \n" +"
            • Viktor Smári
            • \n" "
            \n" "\n" "

            Translations:

            \n" @@ -1617,7 +1496,7 @@ msgid "" "\n" "

            Icelandic:

            \n" "
              \n" -"
            • Eva Þurríðardóttir
            • \n" +"
            • Eva Þuríðardóttir
            • \n" "
            • Smári McCarthy
            • \n" "
            • Tómas Árni Jónasson
            • \n" "
            \n" @@ -1629,61 +1508,67 @@ msgid "" "\n" msgstr "" -#: templates/help/copyright.html:6 +#: wasa2il/templates/help/is/copyright.html:6 msgid "Copyright" msgstr "" -#: templates/help/copyright.html:8 +#: wasa2il/templates/help/is/copyright.html:10 msgid "" "\n" "This is free software, licensed under the GNU Affero General Public " "License.\n" msgstr "" -#: templates/help/index.html:8 +#: wasa2il/templates/help/is/index.html:8 msgid "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." msgstr "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." -#: templates/help/index.html:9 +#: wasa2il/templates/help/is/index.html:9 msgid "" -"If you ever feel like you aren't getting a good enough explanation, please " -"\n" -"Polities are groups of people who come together to make decisions and enact " -"their will.\n" -"These are given various names depending on their form, structure, intent, " -"scale and scope.\n" +"Polities are groups of people who come together to make decisions and " +"enact their will.\n" +"These are given various names depending on their form, structure, intent," +" scale and scope.\n" "Therefore they are variously called \"countries\", \"towns\", \"clubs\", " "\"cabals\", \"mafias\", \"federations\",\n" "\"treaties\", \"unions\", \"associations\", \"companies\", \"phyles\", " @@ -1693,52 +1578,54 @@ msgid "" "

            \n" "The reason we use the word \"polity\" in Wasa2il is that it is the most " "generic term we could\n" -"find. It says nothing of the form, the structure, the intent, scale or scope " -"of the group\n" +"find. It says nothing of the form, the structure, the intent, scale or " +"scope of the group\n" "of people, nor does it preclude anything. Using the word \"group\" could " "work too, but it lacks\n" "the imporant factor that there is an intent to make decisions and enact " "will.\n" "

            \n" "

            \n" -"In addition to consisting of a group of people, a polity will have a set of " -"laws\n" -"the group has decided to adhere to. In an abstract sense, membership in a " -"polity\n" -"grants a person certain rights and priviledges. For instance, membership in " -"a \n" -"school's student body may grant you the right to attend their annual prom,\n" +"In addition to consisting of a group of people, a polity will have a set " +"of laws\n" +"the group has decided to adhere to. In an abstract sense, membership in a" +" polity\n" +"grants a person certain rights and priviledges. For instance, membership " +"in a \n" +"school's student body may grant you the right to attend their annual " +"prom,\n" "and membership in a country (i.e. residency or citizenship) grants you a " "right \n" -"to live there and do certain things there, such as start companies. stand " -"in \n" +"to live there and do certain things there, such as start companies. stand" +" in \n" "elections, and so on.\n" "

            \n" "

            \n" -"Each polity has different rules - these are also called statutes, bylaws or " -"laws - \n" +"Each polity has different rules - these are also called statutes, bylaws " +"or laws - \n" "which affect the polity on two different levels.\n" "

            \n" "

            \n" "Firstly, there are meta-rules, which describe how rules are formed, how\n" -"decisions are made, how meetings happen, and how governance in general \n" +"decisions are made and how governance in general \n" "happens. Wasa2il has to be flexible enough to accomodate the varying \n" -"meta-rules of a given polity, otherwise the polity may decide that Wasa2il " -"isn't \n" -"useful to them. Sometimes these rules are referred to as \"rules of procedure" -"\" \n" -"or \"constitution\", depending on the type of polity which is using them.\n" +"meta-rules of a given polity, otherwise the polity may decide that " +"Wasa2il isn't \n" +"useful to them. Sometimes these rules are referred to as \"rules of " +"procedure\" \n" +"or \"constitution\", depending on the type of polity which is using them." +"\n" "

            \n" "

            \n" -"Secondly there are external rules, which are the decisions the polity makes " -"which\n" +"Secondly there are external rules, which are the decisions the polity " +"makes which\n" "don't affect its internal decisionmaking process.\n" "

            \n" "

            \n" -"It is hard to talk about a term completely in the abstract. We can describe " -"its features, but\n" -"that only gets us so far. So let's look at some of the things that can vary " -"from one polity\n" +"It is hard to talk about a term completely in the abstract. We can " +"describe its features, but\n" +"that only gets us so far. So let's look at some of the things that can " +"vary from one polity\n" "to another, and then take a few examples in each.\n" "

            \n" "

            Scope

            \n" @@ -1750,57 +1637,57 @@ msgid "" "a common interest of its members.\n" "

            \n" "

            \n" -"La Casa Invisible is a social center in Málaga, Spain, which works in " -"the Málaga region\n" -"to promote ideas of social cohesion, autonomy, and democracy. It operates a " -"café, a book store,\n" -"a music hall, and various other projects, each of which could be considered " -"a sub-polity of\n" -"the social center itself. The scope of La Casa Invisible's actions is mostly " -"bound to decisions\n" +"La Casa Invisible is a social center in Málaga, Spain, which works" +" in the Málaga region\n" +"to promote ideas of social cohesion, autonomy, and democracy. It operates" +" a café, a book store,\n" +"a music hall, and various other projects, each of which could be " +"considered a sub-polity of\n" +"the social center itself. The scope of La Casa Invisible's actions is " +"mostly bound to decisions\n" "regarding the social center itself, and the activities that take place " "within it.\n" "

            \n" "

            \n" -"The Union of the Comoros (Udzima wa Komori) is an island nation to " -"the east of Africa, \n" -"just north of Madagascar. It has a population of 798.000 people living in an " -"area of 2.235km². \n" -"The scope of The Comoros as a polity is the land and national waters they " -"control, their airspace,\n" -"and their foreign trade, defense and other agreements they are party to. As " -"such, they have\n" -"municipal sub-polities, and are a member of the African Union, Francophonie, " -"Organization of Islamic\n" -"Cooperation, Arab League and Indian Ocean Commission superpolities, amongst " -"others.\n" +"The Union of the Comoros (Udzima wa Komori) is an island nation to" +" the east of Africa, \n" +"just north of Madagascar. It has a population of 798.000 people living in" +" an area of 2.235km². \n" +"The scope of The Comoros as a polity is the land and national waters they" +" control, their airspace,\n" +"and their foreign trade, defense and other agreements they are party to. " +"As such, they have\n" +"municipal sub-polities, and are a member of the African Union, " +"Francophonie, Organization of Islamic\n" +"Cooperation, Arab League and Indian Ocean Commission superpolities, " +"amongst others.\n" "

            \n" "

            Scale

            \n" "

            \n" "The scale of a polity determines how large it can be expected to become. " "Some polities are specifically\n" -"structured with intent to grow, while others intentionally try to stay at a " -"constant size.\n" +"structured with intent to grow, while others intentionally try to stay at" +" a constant size.\n" "

            \n" "

            \n" -"Muff Divers is a diving club in the village of Muff in Ireland. It " -"claims to be the fastest\n" +"Muff Divers is a diving club in the village of Muff in Ireland. It" +" claims to be the fastest\n" "growing diving club in the world, most likely owing to its name.\n" "

            \n" "

            Intent

            \n" "

            \n" "A polity is created around intent. Some polities intend to take over the " "world, others intend to make\n" -"the nicest cupcakes in all of the land. Some polities intend to send people " -"into space, and others\n" +"the nicest cupcakes in all of the land. Some polities intend to send " +"people into space, and others\n" "intend to track down and arrest criminals. Polities have all sorts of " "motives and intents.\n" "

            \n" "

            \n" "On the most basic level, a polity's intent is a description of what it " "intends to do. This has nothing\n" -"to do with whether the polity has the ability to do it, or whether anybody " -"or anything - such as another\n" +"to do with whether the polity has the ability to do it, or whether " +"anybody or anything - such as another\n" "polity, or the laws of physics - stand in their way.\n" "

            \n" "

            \n" @@ -1810,16 +1697,16 @@ msgid "" "

            \n" "Representative democracy, direct democracy, participatory democracy, " "dictatorship. There are lots of terms\n" -"which describe the structure of a polity. In one sense, it refers to where " -"in the structure of relations\n" +"which describe the structure of a polity. In one sense, it refers to " +"where in the structure of relations\n" "between people the authority lies. In a dictatorship, one person has " "ultimate authority, although he may\n" -"choose to grant some authority downstream to trusted advisors, who in turn " -"have trusted advisors, and so\n" -"on. In a fully egealitarian system, each individual is equipotent, meaning " -"he has an equal ability to\n" -"everybody else to instigate decisions - however, it depends on the structure " -"what ability the individual\n" +"choose to grant some authority downstream to trusted advisors, who in " +"turn have trusted advisors, and so\n" +"on. In a fully egealitarian system, each individual is equipotent, " +"meaning he has an equal ability to\n" +"everybody else to instigate decisions - however, it depends on the " +"structure what ability the individual\n" "has to actually complete the decision making.\n" "

            \n" "

            \n" @@ -1833,37 +1720,37 @@ msgid "" "

            \n" msgstr "" -#: templates/help/proposal.html:6 +#: wasa2il/templates/help/is/proposal.html:6 msgid "Proposals" msgstr "Proposals" -#: templates/help/proposal.html:8 +#: wasa2il/templates/help/is/proposal.html:60 #, fuzzy msgid "" "\n" "

            \n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

            \n" "

            \n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

            \n" "

            \n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -1871,14 +1758,14 @@ msgid "" "

            \n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

            \n" "

            Proposing a new agreement

            \n" "

            \n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

            \n" "

            Proposing changes to a previous agreement

            \n" "

            \n" @@ -1892,10 +1779,10 @@ msgid "" "

            \n" "

            Making changes to a proposal

            \n" "

            \n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

              \n" "\t
            1. Remove a clause/statement from the document
            2. \n" "\t
            3. Move a clause/statement within the document
            4. \n" @@ -1906,8 +1793,9 @@ msgid "" "

              \n" "

              Voting on a proposal

              \n" "

              \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " @@ -1918,26 +1806,26 @@ msgstr "" "

              \n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

              \n" "

              \n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

              \n" "

              \n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -1945,14 +1833,14 @@ msgstr "" "

              \n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

              \n" "

              Proposing a new agreement

              \n" "

              \n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

              \n" "

              Proposing changes to a previous agreement

              \n" "

              \n" @@ -1966,10 +1854,10 @@ msgstr "" "

              \n" "

              Making changes to a proposal

              \n" "

              \n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

                \n" "\\t
              1. Remove a clause/statement from the document
              2. \n" "\\t
              3. Move a clause/statement within the document
              4. \n" @@ -1980,23 +1868,25 @@ msgstr "" "

                \n" "

                Voting on a proposal

                \n" "

                \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " "individually first.\n" "

                \n" -#: templates/help/wasa2il.html:8 +#: wasa2il/templates/help/is/wasa2il.html:26 msgid "" "\n" "

                \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

                \n" "

                \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2006,24 +1896,25 @@ msgid "" "goals and mutual understandings.\n" "

                \n" "

                \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

                \n" msgstr "" "\n" "

                \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

                \n" "

                \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2033,80 +1924,276 @@ msgstr "" "goals and mutual understandings.\n" "

                \n" "

                \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

                \n" -#: templates/registration/activate.html:5 +#: wasa2il/templates/registration/activate.html:5 msgid "Welcome to Wasa2il!" msgstr "Welcome to Wasa2il!" -#: templates/registration/activate.html:6 +#: wasa2il/templates/registration/activate.html:6 msgid "You are now successfully signed up. Sign in to start having fun!" msgstr "You are now successfully signed up. Sign in to start having fun!" -#: templates/registration/login.html:6 +#: wasa2il/templates/registration/activation_complete.html:7 +msgid "Email verified!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:11 +msgid "Congratulations, your email has been verified!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:12 +msgid "You may now try to log in!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:13 +#: wasa2il/templates/registration/login.html:22 +msgid "Login" +msgstr "" + +#: wasa2il/templates/registration/activation_email.txt:2 +msgid "Please click the link below to verify your email address." +msgstr "" + +#: wasa2il/templates/registration/activation_email.txt:6 +#, python-format +msgid "This link will be active for %(expiration_days)s days." +msgstr "" + +#: wasa2il/templates/registration/activation_email_subject.txt:2 +#: wasa2il/templates/registration/registration_complete.html:7 +msgid "Email verification" +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:3 +msgid "" +"As of February 12th 2014, we require the verification of all user " +"accounts via the so-called Icekey." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:5 +msgid "" +"Please be advised that by registering and verifying your account, you " +"become a member of the Pirate Party of Iceland." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:7 +msgid "" +"Membership of political organizations is considered sensitive information" +" by law." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:8 +msgid "" +"Therefore, you should keep the following in mind when becoming a member " +"and using our system:" +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:10 +msgid "" +"Your username is publicly visible. If you don't want to be recognized, " +"use a different one than what you use elsewhere." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:11 +msgid "" +"Your profile settings are mostly public, including your " +"display name, image and description. We don't fill that out for you, " +"though." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:12 +msgid "Don't put anything in there that you don't want visible to the public." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:13 +msgid "We do not display your email address in public." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:14 +msgid "If you have questions or concerns regarding privacy, please email us:" +msgstr "" + +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/registration_form.html:6 msgid "and partake in democracy..." msgstr "" -#: templates/registration/login.html:17 -#: templates/registration/password_reset_complete.html:5 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:5 -#: templates/registration/password_reset_form.html:5 +#: wasa2il/templates/registration/login.html:9 +msgid "" +"If you forgot your username, you can log in or reset your password with " +"your email address or SSN instead." +msgstr "" + +#: wasa2il/templates/registration/login.html:11 +msgid "If problems arise, please send an email to the following email address:" +msgstr "" + +#: wasa2il/templates/registration/login.html:24 +#: wasa2il/templates/registration/password_reset_complete.html:5 +#: wasa2il/templates/registration/password_reset_confirm.html:8 +#: wasa2il/templates/registration/password_reset_done.html:5 +#: wasa2il/templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "" -#: templates/registration/password_change_done.html:7 -msgid "Password changed" +#: wasa2il/templates/registration/logout.html:7 +msgid "Logged out" +msgstr "" + +#: wasa2il/templates/registration/logout.html:10 +msgid "We hope you'll be back soon. It'd be fun!" +msgstr "" + +#: wasa2il/templates/registration/password_change_done.html:11 +msgid "Success! Your password has been changed." +msgstr "" + +#: wasa2il/templates/registration/password_change_done.html:13 +msgid "Back to settings" msgstr "" -#: templates/registration/password_reset_complete.html:7 +#: wasa2il/templates/registration/password_reset_complete.html:7 msgid "Password reset successfully" msgstr "" -#: templates/registration/password_reset_confirm.html:18 +#: wasa2il/templates/registration/password_reset_confirm.html:22 +msgid "Error" +msgstr "" + +#: wasa2il/templates/registration/password_reset_confirm.html:23 msgid "Password reset failed" msgstr "" -#: templates/registration/password_reset_done.html:6 -msgid "Email with password reset instructions has been sent." +#: wasa2il/templates/registration/password_reset_done.html:5 +msgid "Check your email!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:7 +msgid "Email with password reset instructions may have been sent." +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:9 +#: wasa2il/templates/registration/password_reset_form.html:15 +msgid "Hints:" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:11 +msgid "Check your spam folder!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:12 +msgid "" +"If you do not receive an email, try resetting your password with other " +"email addresses you may have used." +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:13 +msgid "" +"For security and privacy reasons, we cannot tell you whether you used the" +" correct email address. Sorry!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:14 +msgid "Still nothing? Try creating a new account." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: wasa2il/templates/registration/password_reset_email.html:2 #, python-format -msgid "Reset password at %(site_name)s" +msgid "Someone (probably you) requested a password reset at %(site_name)s." +msgstr "" + +#: wasa2il/templates/registration/password_reset_email.html:4 +msgid "If you are unfamiliar with this request, you should ignore this message." +msgstr "" + +#: wasa2il/templates/registration/password_reset_email.html:6 +msgid "To reset your password, please click the following link:" +msgstr "" + +#: wasa2il/templates/registration/password_reset_form.html:5 +msgid "The tricky email question" msgstr "" -#: templates/registration/password_reset_form.html:9 +#: wasa2il/templates/registration/password_reset_form.html:11 msgid "Send password" msgstr "" -#, fuzzy -#~ msgid "Select topics" -#~ msgstr "Nieuw onderwerp" +#: wasa2il/templates/registration/password_reset_form.html:17 +msgid "Not sure which email you used? Try them all!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_subject.txt:2 +msgid "Password reset requested" +msgstr "" + +#: wasa2il/templates/registration/registration_complete.html:11 +msgid "" +"Please check your email to find the verification message we have just " +"sent, and click the appropriate link." +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:6 +msgid "Verification error" +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:8 +msgid "" +"The following error occurred during the processing of your account's " +"verification:" +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:14 +msgid "Please try again and if the error persists, contact an administrator." +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:6 +msgid "Multiple accounts detected" +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:8 +msgid "" +"It appears that you already have a different account. Its username and " +"email address are provided below. Please try logging in again using its " +"credentials." +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:9 +msgid "If you have any further problems, please contact an administrator." +msgstr "" -#~ msgid "Back to document list" -#~ msgstr "Terug naar documentenlijst" +#: wasa2il/templates/registration/verification_duplicate.html:11 +msgid "Username" +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:12 +msgid "Email" +msgstr "" -#~ msgid "View this document" -#~ msgstr "View this document" +#: wasa2il/templates/registration/verification_needed.html:6 +msgid "Verification needed" +msgstr "" -#~ msgid "[Unnumbered proposal]" -#~ msgstr "[Unnumbered proposal]" +#: wasa2il/templates/registration/verification_needed.html:8 +msgid "" +"The account registration process cannot be completed until verification " +"has been provided." +msgstr "" -#~ msgid "Propose alternative" -#~ msgstr "Propose alternative" +#: wasa2il/templates/registration/verification_needed.html:9 +msgid "Please select one of the following options" +msgstr "" -#~ msgid "Add agenda item" -#~ msgstr "Add agenda item" +#: wasa2il/templates/registration/verification_needed.html:11 +msgid "Verify identity" +msgstr "" -#~ msgid "ID" -#~ msgstr "ID" diff --git a/wasa2il/locale/tr/LC_MESSAGES/django.po b/wasa2il/locale/tr/LC_MESSAGES/django.po index a087c0ea..fead323b 100644 --- a/wasa2il/locale/tr/LC_MESSAGES/django.po +++ b/wasa2il/locale/tr/LC_MESSAGES/django.po @@ -1,1342 +1,1210 @@ + msgid "" msgstr "" -"Project-Id-Version: wasa2il\n" +"Project-Id-Version: wasa2il\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-18 18:17+0000\n" +"POT-Creation-Date: 2016-08-10 10:13+0000\n" "PO-Revision-Date: 2013-01-24 19:50+0100\n" "Last-Translator: smari \n" +"Language: tr\n" "Language-Team: Turkish\n" -"Language: tr_TR\n" +"Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.net\n" +"Generated-By: Babel 2.3.4\n" + +#: core/authentication.py:57 core/forms.py:46 +msgid "E-mail" +msgstr "" + +#: core/authentication.py:58 +msgid "Password" +msgstr "" + +#: core/base_classes.py:8 core/models.py:46 +#: wasa2il/templates/forum/forum_detail.html:18 +msgid "Name" +msgstr "" + +#: core/forms.py:46 +msgid "The email address you'd like to use for the site." +msgstr "" + +#: core/forms.py:63 +msgid "Filename must contain file extension" +msgstr "" + +#: core/models.py:32 +msgid "Description" +msgstr "" + +#: core/models.py:46 +msgid "The name to display on the site." +msgstr "" + +#: core/models.py:47 +msgid "E-mail visible" +msgstr "" + +#: core/models.py:47 +msgid "Whether to display your email address on your profile page." +msgstr "" + +#: core/models.py:48 +msgid "Bio" +msgstr "" + +#: core/models.py:49 +msgid "Picture" +msgstr "" + +#: core/models.py:53 +msgid "Language" +msgstr "" + +#: core/models.py:54 +msgid "Whether to show all topics in a polity, or only starred." +msgstr "" + +#: core/models.py:170 +msgid "Officers" +msgstr "" + +#: core/models.py:172 +msgid "Publicly listed?" +msgstr "" + +#: core/models.py:172 +msgid "Whether the polity is publicly listed or not." +msgstr "" + +#: core/models.py:173 +msgid "Publicly viewable?" +msgstr "" + +#: core/models.py:173 +msgid "Whether non-members can view the polity and its activities." +msgstr "" + +#: core/models.py:174 +msgid "Can only officers make new issues?" +msgstr "" + +#: core/models.py:174 +msgid "" +"If this is checked, only officers can create new issues. If it's " +"unchecked, any member can start a new issue." +msgstr "" -#: core/models.py:357 templates/core/polity_detail.html:111 +#: core/models.py:175 +msgid "Front polity?" +msgstr "" + +#: core/models.py:175 +msgid "" +"If checked, this polity will be displayed on the front page. The first " +"created polity automatically becomes the front polity." +msgstr "" + +#: core/models.py:303 +msgid "Accepted at assembly" +msgstr "" + +#: core/models.py:304 +msgid "Rejected at assembly" +msgstr "" + +#: core/models.py:313 wasa2il/templates/core/polity_detail.html:24 +#: wasa2il/templates/core/polity_detail.html:107 +#: wasa2il/templates/core/polity_detail.html:114 +#: wasa2il/templates/core/polity_list.html:17 +msgid "Topics" +msgstr "Topics" + +#: core/models.py:319 +msgid "Ruleset" +msgstr "" + +#: core/models.py:321 wasa2il/templates/core/issue_detail.html:39 +msgid "Special process" +msgstr "" + +#: core/models.py:510 wasa2il/templates/core/issues_new.html:18 +#: wasa2il/templates/core/polity_detail.html:47 #, fuzzy msgid "Issue" msgstr "Issues" -#: core/models.py:361 +#: core/models.py:515 #, fuzzy msgid "Topic" msgstr "Topics" -#: core/models.py:365 templates/core/polity_list.html:14 +#: core/models.py:520 wasa2il/templates/core/polity_list.html:16 msgid "Polity" msgstr "Polity" -#: templates/403.html:5 +#: core/models.py:659 +msgid "Proposed" +msgstr "" + +#: core/models.py:660 wasa2il/templates/core/issue_detail.html:49 +msgid "Accepted" +msgstr "" + +#: core/models.py:661 wasa2il/templates/core/issue_detail.html:49 +msgid "Rejected" +msgstr "" + +#: core/models.py:662 +msgid "Deprecated" +msgstr "" + +#: core/models.py:800 wasa2il/templates/core/election_detail.html:93 +msgid "Voting system" +msgstr "" + +#: core/models.py:801 wasa2il/templates/core/election_detail.html:74 +#: wasa2il/templates/core/election_list.html:19 +msgid "Deadline for candidacy" +msgstr "" + +#: core/models.py:802 +msgid "Start time for votes" +msgstr "" + +#: core/models.py:803 wasa2il/templates/core/election_detail.html:75 +#: wasa2il/templates/core/election_list.html:20 +#: wasa2il/templates/core/issue_detail.html:36 +msgid "Deadline for votes" +msgstr "" + +#: core/models.py:814 wasa2il/templates/core/election_detail.html:77 +msgid "Membership deadline" +msgstr "" + +#: core/models.py:817 wasa2il/templates/base.html:142 +msgid "Instructions" +msgstr "" + +#: core/views.py:423 +msgid "voting" +msgstr "" + +#: wasa2il/templates/403.html:5 msgid "403 Access Denied" msgstr "" -#: templates/404.html:5 +#: wasa2il/templates/404.html:5 msgid "404 File Not Found" msgstr "" -#: templates/base.html:7 -msgid "wassa2il" -msgstr "wassa2il" +#: wasa2il/templates/500.html:7 +msgid "Something bad happened!" +msgstr "" -#: templates/base.html:52 -msgid "‫وسائل" -msgstr "‫وسائل" +#: wasa2il/templates/500.html:9 +msgid "" +"A bunch of well-trained monkeys have been notified and they will take a " +"look at the problem as soon as possible." +msgstr "" -#: templates/base.html:65 templates/notLoginInHome.html:47 -#: templates/help/agreement.html:6 templates/help/authors.html:6 -#: templates/help/copyright.html:6 templates/help/index.html:6 -#: templates/help/polity.html:6 templates/help/proposal.html:6 -#: templates/help/wasa2il.html:6 +#: wasa2il/templates/500.html:11 +msgid "" +"Sometimes things break only for a few seconds, so it may work if you try " +"again." +msgstr "" + +#: wasa2il/templates/500.html:13 +msgid "Otherwise, please email us at" +msgstr "" + +#: wasa2il/templates/base.html:8 +msgid "Voting System - Pirate Party Iceland" +msgstr "" + +#: wasa2il/templates/base.html:91 wasa2il/templates/core/issue_detail.html:78 +msgid "There was an error while processing your vote. Please try again." +msgstr "" + +#: wasa2il/templates/base.html:94 +msgid "Your votes have been submitted!" +msgstr "" + +#: wasa2il/templates/base.html:95 +msgid "" +"You can continue adding, removing or reordering candidates until the " +"deadline." +msgstr "" + +#: wasa2il/templates/base.html:98 +#: wasa2il/templates/core/election_detail.html:175 +msgid "Working..." +msgstr "" + +#: wasa2il/templates/base.html:107 wasa2il/templates/help/is/agreement.html:6 +#: wasa2il/templates/help/is/authors.html:6 +#: wasa2il/templates/help/is/copyright.html:6 +#: wasa2il/templates/help/is/index.html:6 +#: wasa2il/templates/help/is/polity.html:6 +#: wasa2il/templates/help/is/proposal.html:6 +#: wasa2il/templates/help/is/wasa2il.html:6 msgid "Help" msgstr "Yardım" -#: templates/base.html:69 +#: wasa2il/templates/base.html:113 msgid "My profile" msgstr "" -#: templates/base.html:70 +#: wasa2il/templates/base.html:114 #, fuzzy msgid "My settings" msgstr "Meetings" -#: templates/base.html:71 +#: wasa2il/templates/base.html:116 +#: wasa2il/templates/registration/verification_needed.html:12 msgid "Logout" msgstr "Oturumu kapat" -#: templates/base.html:75 templates/hom01.html:18 -#: templates/registration/login.html:6 templates/registration/login.html:15 -#: templates/registration/password_reset_complete.html:9 +#: wasa2il/templates/base.html:120 wasa2il/templates/entry.html:17 +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/password_reset_complete.html:9 msgid "Log in" msgstr "Oturum aç" -#: templates/base.html:76 templates/hom01.html:12 -#: templates/notLoginInHome.html:14 templates/registration/login.html:16 +#: wasa2il/templates/base.html:121 wasa2il/templates/entry.html:11 +#: wasa2il/templates/registration/login.html:23 +#: wasa2il/templates/registration/registration_form.html:6 +#: wasa2il/templates/registration/registration_form.html:26 msgid "Sign up" msgstr "Kayıt ol" -#: templates/base.html:91 +#: wasa2il/templates/base.html:127 +msgid "Search agreements" +msgstr "" + +#: wasa2il/templates/base.html:139 msgid "Back to top" msgstr "Başa dön" -#: templates/base.html:92 +#: wasa2il/templates/base.html:140 msgid "About wasa2il" msgstr "wasa2il hakkında" -#: templates/base.html:93 +#: wasa2il/templates/base.html:141 msgid "License" msgstr "Lisans" -#: templates/base.html:94 templates/help/authors.html:6 +#: wasa2il/templates/base.html:143 wasa2il/templates/help/is/authors.html:6 msgid "Authors" msgstr "Yazarlar" -#: templates/hom01.html:13 +#: wasa2il/templates/entry.html:12 msgid "In order to use Wasa2il you need to register an account." msgstr "Wasa2il kullanmak için bir hesaba kayıt olmanız gerek." -#: templates/hom01.html:19 +#: wasa2il/templates/entry.html:18 msgid "If you log in, you can participate in your polities." msgstr "If you log in, you can participate in your polities." -#: templates/hom01.html:24 templates/notLoginInHome.html:33 +#: wasa2il/templates/entry.html:23 msgid "Browse Polities" msgstr "Browse Polities" -#: templates/hom01.html:25 +#: wasa2il/templates/entry.html:24 msgid "You can browse publicly visible polities without registering." msgstr "You can browse publicly visible polities without registering." -#: templates/hom01.html:35 -msgid "FAQ" -msgstr "SSS" - -#: templates/hom01.html:37 templates/help/index.html:15 -msgid "What is a polity?" -msgstr "What is a polity?" - -#: templates/hom01.html:38 -msgid "How electronic democracy work?" -msgstr "Elektronik demokrasi nasıl işler?" - -#: templates/hom01.html:39 -msgid "Who can use Wasa2il?" -msgstr "Wasa2il'i kimler kullanabilir?" - -#: templates/hom01.html:40 -msgid "What does Wasa2il mean?" -msgstr "Wasa2il ne demek?" - -#: templates/hom01.html:44 -msgid "New polities" -msgstr "New polities" - -#: templates/hom01.html:52 -msgid "Recent decisions" -msgstr "En yeni kararlar" - -#: templates/home.html:8 -#, fuzzy -msgid "Your polities" -msgstr "Your Polities" - -#: templates/home.html:14 -#, fuzzy -msgid "Browse other polities" -msgstr "Browse Polities" - -#: templates/home.html:19 -#, fuzzy -msgid "Take Action!" -msgstr "Varsayımlar" - -#: templates/home.html:21 -#, fuzzy -msgid "Browse polities" -msgstr "Browse Polities" - -#: templates/home.html:22 -msgid "Edit your profile" -msgstr "" - -#: templates/home.html:23 -#, fuzzy -msgid "Create a polity" -msgstr "Leave polity" - -#: templates/home.html:30 templates/core/issue_detail.html:66 -#, fuzzy -msgid "Your documents" -msgstr "Senin dokümanların" - -#: templates/home.html:33 templates/home.html.py:51 -#: templates/core/topic_detail.html:63 -msgid "in" -msgstr "in" - -#: templates/home.html:39 -msgid "Recently adopted law" -msgstr "" - -#: templates/home.html:39 templates/home.html.py:48 -#, fuzzy -msgid "in your polities" -msgstr "Your Polities" - -#: templates/home.html:48 -#, fuzzy -msgid "New proposals" -msgstr "Withdraw proposal" - -#: templates/notLoginInHome.html:23 -msgid "Start a Policy" -msgstr "Start a Policy" - -#: templates/notLoginInHome.html:49 -msgid "Join Code" -msgstr "Join Code" - -#: templates/notLoginInHome.html:51 -msgid "Free Software" -msgstr "Özgür Yazılım" - -#: templates/profile.html:18 +#: wasa2il/templates/profile.html:19 msgid "Summary" msgstr "" -#: templates/profile.html:31 +#: wasa2il/templates/profile.html:39 msgid "This user hasn't provided a biography." msgstr "" -#: templates/profile.html:37 -msgid "This user has created:" +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +#: wasa2il/templates/profile.html:55 +msgid "Version" msgstr "" -#: templates/profile.html:40 -#, fuzzy -msgid "polities" -msgstr "Polities" - -#: templates/profile.html:41 -#, fuzzy -msgid "issues" -msgstr "Issues" - -#: templates/profile.html:42 -msgid "documents" -msgstr "documents" - -#: templates/profile.html:63 -msgid "is not viewable by non-members." -msgstr "" +#: wasa2il/templates/core/document_list.html:10 +#: wasa2il/templates/core/polity_list.html:18 wasa2il/templates/search.html:6 +msgid "Documents" +msgstr "Documents" -#: templates/settings.html:7 -#: templates/registration/password_change_done.html:5 -#: templates/registration/password_change_form.html:5 +#: wasa2il/templates/registration/password_change_done.html:7 +#: wasa2il/templates/registration/password_change_form.html:7 +#: wasa2il/templates/settings.html:8 #, fuzzy msgid "Change password" msgstr "Withdraw proposal" -#: templates/settings.html:8 +#: wasa2il/templates/settings.html:9 #, fuzzy msgid "Settings" msgstr "Meetings" -#: templates/settings.html:9 +#: wasa2il/templates/settings.html:10 msgid "You are signed in as" msgstr "" -#: templates/settings.html:16 -#: templates/registration/password_change_form.html:10 -#: templates/registration/password_reset_confirm.html:13 -msgid "Submit" -msgstr "" +#: wasa2il/templates/core/document_form.html:18 +#: wasa2il/templates/core/document_update.html:121 +#: wasa2il/templates/core/election_form.html:35 +#: wasa2il/templates/core/issue_form.html:30 +#: wasa2il/templates/core/polity_form.html:13 +#: wasa2il/templates/core/topic_form.html:14 +#: wasa2il/templates/forum/discussion_form.html:16 +#: wasa2il/templates/forum/forum_form.html:17 +#: wasa2il/templates/registration/password_change_form.html:21 +#: wasa2il/templates/registration/password_reset_confirm.html:13 +#: wasa2il/templates/settings.html:19 +msgid "Save" +msgstr "Save" -#: templates/core/_delegations_table.html:4 +#: wasa2il/templates/core/_delegations_table.html:4 msgid "Type" msgstr "Type" -#: templates/core/_delegations_table.html:5 +#: wasa2il/templates/core/_delegations_table.html:5 msgid "Item" msgstr "" -#: templates/core/_delegations_table.html:6 +#: wasa2il/templates/core/_delegations_table.html:6 msgid "To" msgstr "" -#: templates/core/_delegations_table.html:7 +#: wasa2il/templates/core/_delegations_table.html:7 +#: wasa2il/templates/core/issue_detail.html:49 msgid "Result" msgstr "" -#: templates/core/_delegations_table.html:8 -#: templates/core/_delegations_table.html:16 -#: templates/core/delegate_detail.html:29 +#: wasa2il/templates/core/_delegations_table.html:8 +#: wasa2il/templates/core/_delegations_table.html:16 +#: wasa2il/templates/core/delegate_detail.html:29 msgid "Details" msgstr "" -#: templates/core/_delegations_table.html:21 +#: wasa2il/templates/core/_delegations_table.html:21 #, fuzzy msgid "There are no delegations" msgstr "Burada doküman yok!" -#: templates/core/_delegations_table.html:22 +#: wasa2il/templates/core/_delegations_table.html:22 #, fuzzy msgid "What is a delegation?" msgstr "What is a topic?" -#: templates/core/_document_agreement_list_table.html:4 -#: templates/core/_document_list_table.html:4 -#: templates/core/_document_proposals_list_table.html:4 +#: wasa2il/templates/core/_document_agreement_list_table.html:4 +#: wasa2il/templates/core/_document_list_table.html:4 +#: wasa2il/templates/core/_document_proposals_list_table.html:4 msgid "Document" msgstr "Doküman" -#: templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/_document_agreement_list_table.html:5 +#: wasa2il/templates/core/issue_detail.html:44 +#: wasa2il/templates/core/issue_detail.html:80 +msgid "Yes" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:6 +#: wasa2il/templates/core/issue_detail.html:45 +#: wasa2il/templates/core/issue_detail.html:82 +msgid "No" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:7 +#: wasa2il/templates/core/issue_detail.html:81 +msgid "Abstain" +msgstr "" + +#: wasa2il/templates/core/_document_agreement_list_table.html:8 msgid "Adopted" msgstr "Adopted" -#: templates/core/_document_agreement_list_table.html:15 +#: wasa2il/templates/core/_document_agreement_list_table.html:27 msgid "This polity has no agreements." msgstr "This polity has no agreements." -#: templates/core/_document_agreement_list_table.html:16 -#: templates/help/polity.html:119 templates/help/proposal.html:64 +#: wasa2il/templates/core/_document_agreement_list_table.html:28 +#: wasa2il/templates/help/is/polity.html:119 +#: wasa2il/templates/help/is/proposal.html:64 msgid "What is an agreement?" msgstr "What is an agreement?" -#: templates/core/_document_list_table.html:5 +#: wasa2il/templates/core/_document_list_table.html:5 msgid "Adopted?" msgstr "Adopted?" -#: templates/core/_document_list_table.html:6 +#: wasa2il/templates/core/_document_list_table.html:6 msgid "Original author" msgstr "Özgün yazar" -#: templates/core/_document_list_table.html:7 +#: wasa2il/templates/core/_document_list_table.html:7 msgid "Contributors" msgstr "Katılımcılar" -#: templates/core/_document_list_table.html:8 -#: templates/core/_document_proposals_list_table.html:5 +#: wasa2il/templates/core/_document_list_table.html:8 +#: wasa2il/templates/core/_document_proposals_list_table.html:5 msgid "Last edit" msgstr "Son edit" -#: templates/core/_document_list_table.html:21 -#: templates/core/_document_proposals_list_table.html:17 +#: wasa2il/templates/core/_document_list_table.html:21 +#: wasa2il/templates/core/_document_proposals_list_table.html:17 msgid "There are no documents here!" msgstr "Burada doküman yok!" -#: templates/core/_document_proposals_list_table.html:6 +#: wasa2il/templates/core/_document_modal.html:6 +#, python-format +msgid "New %(type_name)s" +msgstr "" + +#: wasa2il/templates/core/_document_modal.html:11 +msgid "Choose a document to reference" +msgstr "" + +#: wasa2il/templates/core/_document_modal.html:22 +msgid "Write assumption:" +msgstr "Write assumption:" + +#: wasa2il/templates/core/_document_modal.html:41 +#, fuzzy +msgid "Statements:" +msgstr "Save statement" + +#: wasa2il/templates/core/_document_modal.html:49 +#: wasa2il/templates/core/polity_detail.html:148 +#: wasa2il/templates/core/topic_detail.html:72 +#: wasa2il/templates/forum/forum_detail.html:48 +msgid "Close" +msgstr "Close" + +#: wasa2il/templates/core/_document_modal.html:50 +#, python-format +msgid "Save %(type_name)s" +msgstr "" + +#: wasa2il/templates/core/_document_proposals_list_table.html:6 #, fuzzy msgid "Actions" msgstr "Varsayımlar" -#: templates/core/_document_proposals_list_table.html:12 +#: wasa2il/templates/core/_document_proposals_list_table.html:12 #, fuzzy msgid "Propose" msgstr "Proposed?" -#: templates/core/_documentsMenu.html:5 +#: wasa2il/templates/core/_documentsMenu.html:5 msgid "Your Documents" msgstr "Senin dokümanların" -#: templates/core/_documentsMenu.html:19 +#: wasa2il/templates/core/_documentsMenu.html:19 msgid "Proposed Documents" msgstr "Proposed Documents" -#: templates/core/_documentsMenu.html:33 +#: wasa2il/templates/core/_documentsMenu.html:33 msgid "Adopted documents" msgstr "Adopted documents" -#: templates/core/_election_candidate_list.html:12 -msgid "Drag candidates here." +#: wasa2il/templates/core/_election_candidate_list.html:23 +#: wasa2il/templates/core/issue_detail.html:77 +#, fuzzy +msgid "Vote" +msgstr "Votes" + +#: wasa2il/templates/core/_election_candidate_list.html:34 +msgid "Your ballot is empty." +msgstr "" + +#: wasa2il/templates/core/_election_candidate_list.html:35 +msgid "Drag candidates here or click the vote buttons." +msgstr "" + +#: wasa2il/templates/core/_election_candidate_list.html:38 +msgid "You have selected all the candidates, good work!" msgstr "" -#: templates/core/_election_candidate_list.html:14 +#: wasa2il/templates/core/_election_candidate_list.html:40 #, fuzzy msgid "There are no candidates standing in this election yet!" msgstr "There are no topics in this polity!" -#: templates/core/_politiesMenu.html:4 -msgid "Your Polities" -msgstr "Your Polities" +#: wasa2il/templates/core/_election_list_table.html:8 +#, fuzzy +msgid "You have voted in this election" +msgstr "There are no topics in this polity!" -#: templates/core/_politiesMenu.html:18 -msgid "Other Polities" -msgstr "Other Polities" +#: wasa2il/templates/core/_election_list_table.html:8 +#, fuzzy +msgid "You have not voted in this election" +msgstr "There are no topics in this polity!" -#: templates/core/_topic_list_table.html:17 +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +#: wasa2il/templates/core/topic_detail.html:34 +#, fuzzy +msgid "Voting" +msgstr "Voting Issues" + +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +#: wasa2il/templates/core/topic_detail.html:34 +msgid "Open" +msgstr "" + +#: wasa2il/templates/core/_election_list_table.html:11 +#: wasa2il/templates/core/election_list.html:25 +#: wasa2il/templates/core/topic_detail.html:34 +#, fuzzy +msgid "Closed" +msgstr "Close" + +#: wasa2il/templates/core/_election_list_table.html:18 +msgid "No elections are scheduled at the moment." +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:8 +#: wasa2il/templates/core/election_form.html:28 +#, fuzzy +msgid "New election" +msgstr "New meeting" + +#: wasa2il/templates/core/_polity_detail_elections.html:13 +msgid "Show closed elections" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:14 +msgid "Show all elections" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +#: wasa2il/templates/core/polity_detail.html:25 +#, fuzzy +msgid "Elections" +msgstr "Varsayımlar" + +#: wasa2il/templates/core/_polity_detail_elections.html:18 +msgid "putting people in power" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:20 +msgid "Sometimes you need to put people in their places. Elections do just that." +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:25 +#: wasa2il/templates/core/election_list.html:15 +#, fuzzy +msgid "Election" +msgstr "Varsayımlar" + +#: wasa2il/templates/core/_polity_detail_elections.html:26 +#: wasa2il/templates/core/election_list.html:16 +#: wasa2il/templates/core/issues_new.html:19 +#: wasa2il/templates/core/polity_detail.html:48 +#: wasa2il/templates/core/topic_detail.html:22 +msgid "State" +msgstr "State" + +#: wasa2il/templates/core/_polity_detail_elections.html:27 +#: wasa2il/templates/core/election_detail.html:91 +#: wasa2il/templates/core/election_detail.html:172 +#: wasa2il/templates/core/election_list.html:17 +msgid "Candidates" +msgstr "" + +#: wasa2il/templates/core/_polity_detail_elections.html:28 +#: wasa2il/templates/core/election_detail.html:89 +#: wasa2il/templates/core/election_detail.html:148 +#: wasa2il/templates/core/election_list.html:18 +#: wasa2il/templates/core/issue_detail.html:42 +#: wasa2il/templates/core/issues_new.html:21 +#: wasa2il/templates/core/polity_detail.html:50 +#: wasa2il/templates/core/topic_detail.html:24 +msgid "Votes" +msgstr "Votes" + +#: wasa2il/templates/core/_topic_list_table.html:19 msgid "There are no topics in this polity!" msgstr "There are no topics in this polity!" -#: templates/core/delegate_detail.html:6 -#: templates/core/document_detail.html:14 -#: templates/core/election_detail.html:6 templates/core/issue_detail.html:6 -#: templates/core/meeting_detail.html:16 templates/core/topic_detail.html:7 -#: templates/forum/discussion_detail.html:6 -#: templates/forum/forum_detail.html:7 +#: wasa2il/templates/core/_topic_list_table.html:20 +msgid "Start a new topic" +msgstr "" + +#: wasa2il/templates/core/delegate_detail.html:6 +#: wasa2il/templates/core/document_detail.html:14 +#: wasa2il/templates/core/election_detail.html:31 +#: wasa2il/templates/core/election_list.html:8 +#: wasa2il/templates/core/issue_detail.html:6 +#: wasa2il/templates/core/issues_new.html:8 +#: wasa2il/templates/core/topic_detail.html:7 +#: wasa2il/templates/forum/discussion_detail.html:6 +#: wasa2il/templates/forum/forum_detail.html:7 msgid "Back to polity" msgstr "Back to polity" -#: templates/core/delegate_detail.html:8 +#: wasa2il/templates/core/delegate_detail.html:8 #, fuzzy msgid "Delegation:" msgstr "Bildirimler" -#: templates/core/delegate_detail.html:8 +#: wasa2il/templates/core/delegate_detail.html:8 msgid "to" msgstr "" -#: templates/core/delegate_detail.html:13 +#: wasa2il/templates/core/delegate_detail.html:13 #, fuzzy msgid "Stop delegating" msgstr "Start meeting" -#: templates/core/delegate_detail.html:14 +#: wasa2il/templates/core/delegate_detail.html:14 msgid "Change delegation" msgstr "" -#: templates/core/delegate_detail.html:33 +#: wasa2il/templates/core/delegate_detail.html:33 msgid "Delegation type" msgstr "" -#: templates/core/delegate_detail.html:37 +#: wasa2il/templates/core/delegate_detail.html:37 #, fuzzy msgid "Delegated item" msgstr "Next agenda item" -#: templates/core/delegate_detail.html:41 +#: wasa2il/templates/core/delegate_detail.html:41 #, fuzzy msgid "Delegated to user" msgstr "Related to issue:" -#: templates/core/delegate_detail.html:45 +#: wasa2il/templates/core/delegate_detail.html:45 msgid "Resulting delegation" msgstr "" -#: templates/core/delegate_detail.html:54 +#: wasa2il/templates/core/delegate_detail.html:54 msgid "Pathway breakdown" msgstr "" -#: templates/core/document_detail.html:8 templates/core/document_update.html:8 +#: wasa2il/templates/core/document_detail.html:8 msgid "Withdraw proposal" msgstr "Withdraw proposal" -#: templates/core/document_detail.html:10 -#: templates/core/document_update.html:10 +#: wasa2il/templates/core/document_detail.html:10 msgid "Propose this document" msgstr "Propose this document" -#: templates/core/document_detail.html:13 +#: wasa2il/templates/core/document_detail.html:13 msgid "Edit this document" msgstr "Bu dokümanı editle" -#: templates/core/document_detail.html:22 +#: wasa2il/templates/core/document_detail.html:22 msgid "Assumptions" msgstr "Varsayımlar" -#: templates/core/document_detail.html:36 +#: wasa2il/templates/core/document_detail.html:36 msgid "Declarations" msgstr "Bildirimler" -#: templates/core/document_form.html:4 +#: wasa2il/templates/core/document_form.html:6 msgid "New Document" msgstr "Yeni dokuman" -#: templates/core/document_form.html:6 +#: wasa2il/templates/core/document_form.html:9 msgid "In polity:" msgstr "In polity:" -#: templates/core/document_form.html:9 -msgid "Related to issues:" -msgstr "Konularla ilgili:" - -#: templates/core/document_form.html:9 -msgid "Related to issue:" -msgstr "Related to issue:" - -#: templates/core/document_form.html:22 templates/core/issue_form.html:12 -#: templates/forum/discussion_form.html:16 templates/forum/forum_form.html:17 -msgid "Save" -msgstr "Save" - -#: templates/core/document_list.html:7 templates/core/issue_detail.html:53 -#: templates/core/polity_detail.html:294 +#: wasa2il/templates/core/document_list.html:7 +#: wasa2il/templates/core/polity_detail.html:83 msgid "New document" msgstr "New document" -#: templates/core/document_list.html:10 templates/core/issue_detail.html:56 -#: templates/core/polity_detail.html:113 templates/core/polity_list.html:17 -#: templates/core/topic_detail.html:30 -msgid "Documents" -msgstr "Documents" +#: wasa2il/templates/core/document_update.html:15 +msgid "Change proposal must differ from its predecessor." +msgstr "" -#: templates/core/document_update.html:15 +#: wasa2il/templates/core/document_update.html:88 msgid "Agreement" msgstr "Agreement" -#: templates/core/document_update.html:16 +#: wasa2il/templates/core/document_update.html:90 +#: wasa2il/templates/core/issue_detail.html:22 msgid "Proposal" msgstr "Proposal" -#: templates/core/document_update.html:17 -msgid "Draft proposal:" -msgstr "Draft proposal:" - -#: templates/core/document_update.html:48 -msgid "Referenced by issues" -msgstr "Referenced by issues" - -#: templates/core/document_update.html:56 -msgid "Contributors to this document" -msgstr "Contributors to this document" - -#: templates/core/document_update.html:65 -#: templates/core/meeting_detail.html:36 -#: templates/core/meeting_detail.html:101 -msgid "Add" -msgstr "Add" - -#: templates/core/document_update.html:73 -#: templates/core/document_update.html:132 -msgid "New reference" -msgstr "New reference" - -#: templates/core/document_update.html:74 -#: templates/core/document_update.html:154 -msgid "New assumption" -msgstr "New assumption" - -#: templates/core/document_update.html:75 -#: templates/core/document_update.html:172 -msgid "New statement" -msgstr "New statement" - -#: templates/core/document_update.html:76 -#: templates/core/document_update.html:189 -msgid "New subheading" -msgstr "New subheading" +#: wasa2il/templates/core/document_update.html:115 +#: wasa2il/templates/core/document_update.html:192 +#: wasa2il/templates/core/issues_new.html:20 +#: wasa2il/templates/core/polity_detail.html:49 +#: wasa2il/templates/core/topic_detail.html:23 +msgid "Comments" +msgstr "Comments" -#: templates/core/document_update.html:77 -msgid "Import structure" +#: wasa2il/templates/core/document_update.html:115 +msgid "optional" msgstr "" -#: templates/core/document_update.html:82 -#: templates/core/document_update.html:89 -msgid "Please note:" +#: wasa2il/templates/core/document_update.html:120 +msgid "Preview" msgstr "" -#: templates/core/document_update.html:83 -msgid "This document has been proposed." +#: wasa2il/templates/core/document_update.html:123 +msgid "Preview is required before saving" msgstr "" -#: templates/core/document_update.html:84 -msgid "" -"Changes you make to it now will become change proposals, which will be voted " -"on individually." -msgstr "" +#: wasa2il/templates/core/document_update.html:127 +#: wasa2il/templates/core/document_update.html:129 +#: wasa2il/templates/registration/password_change_form.html:20 +msgid "Cancel" +msgstr "Cancel" -#: templates/core/document_update.html:90 -msgid "This document has been adopted." +#: wasa2il/templates/core/document_update.html:136 +msgid "Propose change" msgstr "" -#: templates/core/document_update.html:91 -msgid "" -"In order to make change proposals to it, you must import it into a new open " -"issue." +#: wasa2il/templates/core/document_update.html:141 +#: wasa2il/templates/core/document_update.html:143 +msgid "Edit proposal" msgstr "" -#: templates/core/document_update.html:100 -#, fuzzy -msgid "Change proposals" -msgstr "Withdraw proposal" - -#: templates/core/document_update.html:105 -#, fuzzy -msgid "Deleted" -msgstr "Delete" - -#: templates/core/document_update.html:108 -msgid "Moved" +#: wasa2il/templates/core/document_update.html:149 +#: wasa2il/templates/core/document_update.html:151 +msgid "Put to vote" msgstr "" -#: templates/core/document_update.html:115 -msgid "Added at beginning" +#: wasa2il/templates/core/document_update.html:170 +msgid "Referenced issue" msgstr "" -#: templates/core/document_update.html:117 -msgid "Added after:" +#: wasa2il/templates/core/document_update.html:186 +msgid "Versions" msgstr "" -#: templates/core/document_update.html:135 -msgid "Choose a document to reference:" -msgstr "Choose a document to reference:" - -#: templates/core/document_update.html:145 -#: templates/core/document_update.html:163 -#: templates/core/document_update.html:180 -#: templates/core/document_update.html:197 -#: templates/core/document_update.html:215 -#: templates/core/issue_detail.html:117 templates/core/polity_detail.html:327 -#: templates/core/polity_detail.html:363 templates/core/topic_detail.html:87 -#: templates/forum/forum_detail.html:48 -msgid "Close" -msgstr "Close" - -#: templates/core/document_update.html:146 -msgid "Save reference" -msgstr "Save reference" - -#: templates/core/document_update.html:157 -msgid "Write assumption:" -msgstr "Write assumption:" - -#: templates/core/document_update.html:164 -msgid "Save assumption" -msgstr "Save assumption" - -#: templates/core/document_update.html:181 -msgid "Save statement" -msgstr "Save statement" - -#: templates/core/document_update.html:198 -msgid "Save subheading" -msgstr "Save subheading" - -#: templates/core/document_update.html:206 -#, fuzzy -msgid "Import statements" -msgstr "New statement" - -#: templates/core/document_update.html:209 -#, fuzzy -msgid "Statements:" -msgstr "Save statement" - -#: templates/core/document_update.html:216 -#, fuzzy -msgid "Import" -msgstr "Destek" - -#: templates/core/document_update.html:228 -#, fuzzy -msgid "Add reference" -msgstr "New reference" - -#: templates/core/document_update.html:229 -#, fuzzy -msgid "Add assumption" -msgstr "Varsayımlar" - -#: templates/core/document_update.html:231 -#, fuzzy -msgid "Add statement" -msgstr "New statement" +#: wasa2il/templates/core/document_update.html:190 +msgid "Status" +msgstr "Status" -#: templates/core/document_update.html:232 -#, fuzzy -msgid "Add subheading" -msgstr "New subheading" +#: wasa2il/templates/core/document_update.html:191 +msgid "Author" +msgstr "" -#: templates/core/document_update.html:238 -msgid "Delete" -msgstr "Delete" +#: wasa2il/templates/core/document_update.html:210 +msgid "New draft" +msgstr "" -#: templates/core/election_detail.html:8 +#: wasa2il/templates/core/election_detail.html:33 #, fuzzy msgid "Election:" msgstr "Bildirimler" -#: templates/core/election_detail.html:11 +#: wasa2il/templates/core/election_detail.html:36 #, fuzzy msgid "This election is closed." msgstr "This meeting is ongoing." -#: templates/core/election_detail.html:15 -#, fuzzy -msgid "This election is delegated." -msgstr "This polity has no agreements." - -#: templates/core/election_detail.html:15 templates/core/issue_detail.html:15 -#: templates/core/polity_detail.html:31 templates/core/topic_detail.html:15 -msgid "View details." +#: wasa2il/templates/core/election_detail.html:39 +msgid "You cannot vote in this election:" msgstr "" -#: templates/core/election_detail.html:23 -#, fuzzy -msgid "Deadline for candidacy:" -msgstr "Draft proposal:" - -#: templates/core/election_detail.html:24 templates/core/issue_detail.html:26 -msgid "Deadline for votes:" -msgstr "" - -#: templates/core/election_detail.html:25 templates/core/issue_detail.html:29 -#, fuzzy -msgid "Votes:" -msgstr "Votes" - -#: templates/core/election_detail.html:26 -msgid "Candidates:" +#: wasa2il/templates/core/election_detail.html:41 +#: wasa2il/templates/core/election_detail.html:54 +msgid "Please log in." msgstr "" -#: templates/core/election_detail.html:27 -#, fuzzy -msgid "Voting system:" -msgstr "Voting Issues" - -#: templates/core/election_detail.html:39 -#: templates/core/polity_detail.html:159 -msgid "Candidates" +#: wasa2il/templates/core/election_detail.html:43 +msgid "You joined the organization too late." msgstr "" -#: templates/core/election_detail.html:39 -msgid "running in this election" +#: wasa2il/templates/core/election_detail.html:45 +#: wasa2il/templates/core/election_detail.html:56 +msgid "You are not a member of this polity." msgstr "" -#: templates/core/election_detail.html:50 templates/core/issue_detail.html:38 -#, fuzzy -msgid "Vote" -msgstr "Votes" - -#: templates/core/election_detail.html:50 -msgid "for the candidates standing in this election" +#: wasa2il/templates/core/election_detail.html:47 +#: wasa2il/templates/core/election_detail.html:58 +msgid "You do not meet the requirements." msgstr "" -#: templates/core/election_detail.html:51 templates/core/issue_detail.html:39 -msgid "There was an error while processing your vote. Please try again." +#: wasa2il/templates/core/election_detail.html:52 +msgid "You cannot run in this election:" msgstr "" -#: templates/core/issue_detail.html:11 -msgid "This issue is closed." -msgstr "" - -#: templates/core/issue_detail.html:15 -msgid "This issue is delegated." -msgstr "" - -#: templates/core/issue_detail.html:23 +#: wasa2il/templates/core/election_detail.html:65 #, fuzzy -msgid "In topics:" -msgstr "topics" - -#: templates/core/issue_detail.html:25 -#, fuzzy -msgid "Deadline for proposals:" -msgstr "Draft proposal:" - -#: templates/core/issue_detail.html:30 -msgid "Yes:" -msgstr "" - -#: templates/core/issue_detail.html:31 -msgid "No:" -msgstr "" - -#: templates/core/issue_detail.html:38 -msgid "for or against the documents in this issue" -msgstr "" - -#: templates/core/issue_detail.html:41 -msgid "Yes" -msgstr "" - -#: templates/core/issue_detail.html:42 -msgid "Abstain" -msgstr "" - -#: templates/core/issue_detail.html:43 -msgid "No" -msgstr "" - -#: templates/core/issue_detail.html:45 -#, fuzzy -msgid "Voting closes in" -msgstr "Voting Issues" - -#: templates/core/issue_detail.html:52 templates/core/issue_detail.html:103 -#, fuzzy -msgid "Import agreement" -msgstr "Agreement" - -#: templates/core/issue_detail.html:56 -msgid "proposed or in progress" -msgstr "proposed or in progress" - -#: templates/core/issue_detail.html:57 -msgid "" -"Documents are structured texts which contain the laws of the polity, or " -"proposals for such laws." -msgstr "" -"Documents are structured texts which contain the laws of the polity, or " -"proposals for such laws." - -#: templates/core/issue_detail.html:58 -#, fuzzy -msgid "Proposed documents" -msgstr "Proposed Documents" - -#: templates/core/issue_detail.html:67 -msgid "Documents you are working on that haven't been proposed:" -msgstr "" - -#: templates/core/issue_detail.html:78 -#: templates/forum/discussion_detail.html:9 -msgid "Discussion" -msgstr "Tartışma" - -#: templates/core/issue_detail.html:85 -#: templates/forum/discussion_detail.html:23 -msgid "Add comment" -msgstr "Add comment" - -#: templates/core/issue_detail.html:106 -#, fuzzy -msgid "Choose an agreement to import:" -msgstr "Choose a document to reference:" - -#: templates/core/issue_detail.html:114 -msgid "" -"The purpose of importing an agreement to an issue is to be able to propose " -"changes to it." -msgstr "" - -#: templates/core/issue_detail.html:118 -msgid "Import document to issue" -msgstr "" - -#: templates/core/issue_form.html:5 templates/core/polity_detail.html:72 -#: templates/core/topic_detail.html:9 -msgid "New issue" -msgstr "New issue" - -#: templates/core/meeting_detail.html:21 -msgid "Attendance list" -msgstr "Attendance list" - -#: templates/core/meeting_detail.html:23 -msgid "Attend meeting" -msgstr "Attend meeting" - -#: templates/core/meeting_detail.html:25 -msgid "You can sign in to attendance when the meeting has started." -msgstr "You can sign in to attendance when the meeting has started." - -#: templates/core/meeting_detail.html:29 -msgid "Meeting managers" -msgstr "Meeting managers" - -#: templates/core/meeting_detail.html:41 -msgid "This meeting will start in" -msgstr "This meeting will start in" - -#: templates/core/meeting_detail.html:42 -msgid "This meeting is ongoing." -msgstr "This meeting is ongoing." - -#: templates/core/meeting_detail.html:43 -msgid "This meeting ended at" -msgstr "This meeting ended at" - -#: templates/core/meeting_detail.html:51 -msgid "Ajourn meeting" -msgstr "Ajourn meeting" - -#: templates/core/meeting_detail.html:52 -msgid "Start meeting" -msgstr "Start meeting" - -#: templates/core/meeting_detail.html:57 -msgid "Close agenda" -msgstr "Close agenda" - -#: templates/core/meeting_detail.html:60 -msgid "Open agenda" -msgstr "Open agenda" - -#: templates/core/meeting_detail.html:67 -msgid "Previous agenda item" -msgstr "Previous agenda item" - -#: templates/core/meeting_detail.html:68 -msgid "Next agenda item" -msgstr "Next agenda item" - -#: templates/core/meeting_detail.html:69 -msgid "Previous speaker" -msgstr "Previous speaker" - -#: templates/core/meeting_detail.html:70 -msgid "Next speaker" -msgstr "Next speaker" - -#: templates/core/meeting_detail.html:71 -#, fuzzy -msgid "Add speaker" -msgstr "Next speaker" - -#: templates/core/meeting_detail.html:79 -msgid "Want to talk" -msgstr "Want to talk" - -#: templates/core/meeting_detail.html:80 -msgid "Direct response" -msgstr "Direct response" - -#: templates/core/meeting_detail.html:82 -msgid "Clarify" -msgstr "Clarify" - -#: templates/core/meeting_detail.html:83 -msgid "Point of order" -msgstr "Point of order" - -#: templates/core/meeting_detail.html:89 -msgid "Who?" -msgstr "" - -#: templates/core/meeting_detail.html:100 -msgid "Agenda item title" -msgstr "Agenda item title" - -#: templates/core/meeting_detail.html:102 -msgid "Cancel" -msgstr "Cancel" - -#: templates/core/meeting_detail.html:120 -msgid "Start meeting early?" -msgstr "Start meeting early?" - -#: templates/core/meeting_detail.html:123 -msgid "The meeting is scheduled to start at " -msgstr "The meeting is scheduled to start at " - -#: templates/core/meeting_detail.html:124 -msgid "Are you sure you want to start this meeting ahead of schedule?" -msgstr "Are you sure you want to start this meeting ahead of schedule?" - -#: templates/core/meeting_detail.html:127 -msgid "No, don't start the meeting!" -msgstr "No, don't start the meeting!" - -#: templates/core/meeting_detail.html:128 -msgid "Yes, start the meeting." -msgstr "Yes, start the meeting." - -#: templates/core/polity_detail.html:8 -msgid "Leave polity" -msgstr "Leave polity" - -#: templates/core/polity_detail.html:11 -msgid "Join polity" -msgstr "Join polity" - -#: templates/core/polity_detail.html:13 -msgid "Request to join polity" -msgstr "Request to join polity" - -#: templates/core/polity_detail.html:20 -#, fuzzy -msgid "You are an officer in this polity." -msgstr "There are no topics in this polity!" - -#: templates/core/polity_detail.html:22 -#, fuzzy -msgid "You are a member of this polity." -msgstr "Members of this polity" - -#: templates/core/polity_detail.html:31 -#, fuzzy -msgid "This polity is delegated." +msgid "This election is delegated." msgstr "This polity has no agreements." -#: templates/core/polity_detail.html:37 -msgid "Your request to join has been sent." -msgstr "Your request to join has been sent." - -#: templates/core/polity_detail.html:39 -msgid "Your request to join this polity is still pending." -msgstr "Your request to join this polity is still pending." - -#: templates/core/polity_detail.html:46 -msgid "members" -msgstr "members" - -#: templates/core/polity_detail.html:47 -msgid "topics" -msgstr "topics" - -#: templates/core/polity_detail.html:48 -#, fuzzy -msgid "agreements" -msgstr "Agreements" - -#: templates/core/polity_detail.html:49 -msgid "subpolities" -msgstr "subpolities" - -#: templates/core/polity_detail.html:54 templates/core/polity_detail.html:56 -msgid "membership requests" -msgstr "membership requests" - -#: templates/core/polity_detail.html:61 -msgid "You have" -msgstr "" - -#: templates/core/polity_detail.html:61 -#, fuzzy -msgid "delegations" -msgstr "Bildirimler" - -#: templates/core/polity_detail.html:75 -msgid "Show only starred topics" -msgstr "Show only starred topics" - -#: templates/core/polity_detail.html:76 -msgid "New topic" -msgstr "New topic" - -#: templates/core/polity_detail.html:81 templates/core/polity_detail.html:88 -#: templates/core/polity_list.html:16 -msgid "Topics" -msgstr "Topics" - -#: templates/core/polity_detail.html:81 -msgid "of discussion" -msgstr "of discussion" - -#: templates/core/polity_detail.html:83 -msgid "Topics are thematic categories that contain specific issues." -msgstr "Topics are thematic categories that contain specific issues." - -#: templates/core/polity_detail.html:89 templates/core/topic_detail.html:28 -msgid "Issues" -msgstr "Issues" - -#: templates/core/polity_detail.html:90 -msgid "Open Issues" -msgstr "Open Issues" - -#: templates/core/polity_detail.html:91 -msgid "Voting Issues" -msgstr "Voting Issues" - -#: templates/core/polity_detail.html:104 -#, fuzzy -msgid "New issues" -msgstr "New issue" - -#: templates/core/polity_detail.html:104 -#, fuzzy -msgid "in discussion" -msgstr "of discussion" - -#: templates/core/polity_detail.html:106 -#, fuzzy -msgid "These are the newest issues being discussed in this polity." -msgstr "There are no topics in this polity!" - -#: templates/core/polity_detail.html:112 templates/core/polity_detail.html:158 -#: templates/core/topic_detail.html:29 -msgid "State" -msgstr "State" - -#: templates/core/polity_detail.html:114 templates/core/topic_detail.html:31 -msgid "Comments" -msgstr "Comments" - -#: templates/core/polity_detail.html:115 templates/core/polity_detail.html:160 -#: templates/core/topic_detail.html:32 -msgid "Votes" -msgstr "Votes" - -#: templates/core/polity_detail.html:123 templates/core/topic_detail.html:38 -msgid "You have voted on this issue" +#: wasa2il/templates/core/election_detail.html:65 +#: wasa2il/templates/core/topic_detail.html:12 +msgid "View details." msgstr "" -#: templates/core/polity_detail.html:123 templates/core/topic_detail.html:38 -msgid "You have not voted on this issue" +#: wasa2il/templates/core/election_detail.html:73 +msgid "Voting begins" msgstr "" -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -#, fuzzy -msgid "Voting" -msgstr "Voting Issues" - -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -msgid "Open" +#: wasa2il/templates/core/election_detail.html:80 +msgid "Candidacy polities" msgstr "" -#: templates/core/polity_detail.html:126 templates/core/polity_detail.html:171 -#: templates/core/topic_detail.html:42 -#, fuzzy -msgid "Closed" -msgstr "Close" +#: wasa2il/templates/core/election_detail.html:81 +msgid "You can run" +msgstr "" -#: templates/core/polity_detail.html:141 -#, fuzzy -msgid "New election" -msgstr "New meeting" +#: wasa2il/templates/core/election_detail.html:85 +msgid "Voting polities" +msgstr "" -#: templates/core/polity_detail.html:145 -#, fuzzy -msgid "Closed elections" -msgstr "Bildirimler" +#: wasa2il/templates/core/election_detail.html:86 +msgid "You can vote" +msgstr "" -#: templates/core/polity_detail.html:150 -#, fuzzy -msgid "Elections" -msgstr "Varsayımlar" +#: wasa2il/templates/core/election_detail.html:95 +msgid "Details ..." +msgstr "" -#: templates/core/polity_detail.html:150 -msgid "putting people in power" +#: wasa2il/templates/core/election_detail.html:105 +#: wasa2il/templates/core/election_detail.html:154 +msgid "About This Election" msgstr "" -#: templates/core/polity_detail.html:152 -msgid "" -"Sometimes you need to put people in their places. Elections do just that." +#: wasa2il/templates/core/election_detail.html:114 +msgid "Election results" msgstr "" -#: templates/core/polity_detail.html:157 -#, fuzzy -msgid "Election" -msgstr "Varsayımlar" +#: wasa2il/templates/core/election_detail.html:130 +msgid "No votes were cast." +msgstr "" -#: templates/core/polity_detail.html:168 -#, fuzzy -msgid "You have voted in this election" -msgstr "There are no topics in this polity!" +#: wasa2il/templates/core/election_detail.html:134 +msgid "Votes are still being counted." +msgstr "" -#: templates/core/polity_detail.html:168 -#, fuzzy -msgid "You have not voted in this election" -msgstr "There are no topics in this polity!" +#: wasa2il/templates/core/election_detail.html:148 +msgid "your favorites first!" +msgstr "" -#: templates/core/polity_detail.html:184 -msgid "New meeting" -msgstr "New meeting" +#: wasa2il/templates/core/election_detail.html:157 +msgid "How To Vote" +msgstr "" -#: templates/core/polity_detail.html:187 templates/core/polity_detail.html:230 -msgid "Show ongoing meetings" -msgstr "Show ongoing meetings" +#: wasa2il/templates/core/election_detail.html:159 +msgid "Click the Start Voting button to begin" +msgstr "" -#: templates/core/polity_detail.html:188 templates/core/polity_detail.html:231 -msgid "Show upcoming meetings" -msgstr "Show upcoming meetings" +#: wasa2il/templates/core/election_detail.html:160 +msgid "Click a Vote button to vote for a candidate" +msgstr "" -#: templates/core/polity_detail.html:189 templates/core/polity_detail.html:232 -msgid "Show finished meetings" -msgstr "Show finished meetings" +#: wasa2il/templates/core/election_detail.html:161 +msgid "Click the arrows to move your favorite candidates to the top" +msgstr "" -#: templates/core/polity_detail.html:193 -msgid "Meetings" -msgstr "Meetings" +#: wasa2il/templates/core/election_detail.html:162 +msgid "Your vote will be counted when the deadline has passed" +msgstr "" -#: templates/core/polity_detail.html:193 -msgid "physical or virtual" -msgstr "physical or virtual" +#: wasa2il/templates/core/election_detail.html:165 +msgid "Start Voting" +msgstr "" -#: templates/core/polity_detail.html:195 -msgid "" -"A meeting is an event where people come together to discuss a set of agenda " -"items." +#: wasa2il/templates/core/election_detail.html:172 +msgid "running in this election" msgstr "" -"A meeting is an event where people come together to discuss a set of agenda " -"items." -#: templates/core/polity_detail.html:199 -msgid "When" -msgstr "When" +#: wasa2il/templates/core/election_detail.html:177 +msgid "Announce candidacy" +msgstr "" -#: templates/core/polity_detail.html:200 -msgid "Where" -msgstr "Where" +#: wasa2il/templates/core/election_detail.html:180 +msgid "Are you sure you want to withdraw? This can not be undone." +msgstr "" -#: templates/core/polity_detail.html:201 -msgid "Organized by" -msgstr "Organized by" +#: wasa2il/templates/core/election_detail.html:182 +msgid "Withdraw candidacy" +msgstr "" -#: templates/core/polity_detail.html:202 -msgid "Status" -msgstr "Status" +#: wasa2il/templates/core/election_list.html:10 +msgid "Elections in polity" +msgstr "" -#: templates/core/polity_detail.html:227 -#, fuzzy -msgid "New delegation" -msgstr "New meeting" +#: wasa2il/templates/core/issue_detail.html:24 +msgid "In topics" +msgstr "" -#: templates/core/polity_detail.html:236 -#, fuzzy -msgid "Delegations" -msgstr "Bildirimler" +#: wasa2il/templates/core/issue_detail.html:27 +msgid "Start time" +msgstr "" -#: templates/core/polity_detail.html:236 -msgid "votes entrusted to others" +#: wasa2il/templates/core/issue_detail.html:29 +msgid "Deadline for discussion" msgstr "" -#: templates/core/polity_detail.html:238 -msgid "You can set up delgations for the polity, for topics, or for issues." +#: wasa2il/templates/core/issue_detail.html:32 +msgid "Deadline for proposals" msgstr "" -#: templates/core/polity_detail.html:239 -msgid "Here you can see all of your active delegations and where they lead to." +#: wasa2il/templates/core/issue_detail.html:53 +msgid "Majority threshold" msgstr "" -#: templates/core/polity_detail.html:249 -msgid "Subpolities" -msgstr "Subpolities" +#: wasa2il/templates/core/issue_detail.html:57 +#: wasa2il/templates/forum/discussion_detail.html:9 +msgid "Discussion" +msgstr "Tartışma" -#: templates/core/polity_detail.html:251 -msgid "" -"A polity can have subordinate organizational units, such as how a " -"municipality relates to a country." +#: wasa2il/templates/core/issue_detail.html:68 +#: wasa2il/templates/forum/discussion_detail.html:23 +msgid "Add comment" +msgstr "Add comment" + +#: wasa2il/templates/core/issue_detail.html:77 +msgid "for or against this issue" msgstr "" -"A polity can have subordinate organizational units, such as how a " -"municipality relates to a country." -#: templates/core/polity_detail.html:265 -#: templates/forum/discussion_form.html:5 templates/forum/forum_form.html:5 +#: wasa2il/templates/core/issue_form.html:8 +msgid "version" +msgstr "" + +#: wasa2il/templates/core/issue_form.html:22 +msgid "New issue" +msgstr "New issue" + +#: wasa2il/templates/core/issues_new.html:10 +#: wasa2il/templates/core/polity_detail.html:22 +#: wasa2il/templates/core/polity_detail.html:40 #, fuzzy -msgid "New forum" -msgstr "Yeni dokuman" +msgid "New issues" +msgstr "New issue" -#: templates/core/polity_detail.html:268 +#: wasa2il/templates/core/issues_new.html:10 +#: wasa2il/templates/core/polity_detail.html:40 #, fuzzy -msgid "Discussion Forums" -msgstr "Tartışma" +msgid "in discussion" +msgstr "of discussion" -#: templates/core/polity_detail.html:270 -msgid "" -"Often it is important to have open-ended discussions on a range of topics " -"outside of particular issues." +#: wasa2il/templates/core/issues_new.html:11 +#: wasa2il/templates/core/polity_detail.html:42 +#, fuzzy +msgid "These are the newest issues being discussed in this polity." +msgstr "There are no topics in this polity!" + +#: wasa2il/templates/core/issues_new.html:29 +#: wasa2il/templates/core/polity_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:30 +msgid "You have voted on this issue" msgstr "" -#: templates/core/polity_detail.html:274 templates/forum/forum_detail.html:18 -msgid "Name" +#: wasa2il/templates/core/issues_new.html:29 +#: wasa2il/templates/core/polity_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:30 +msgid "You have not voted on this issue" msgstr "" -#: templates/core/polity_detail.html:275 templates/forum/forum_detail.html:15 +#: wasa2il/templates/core/issues_new.html:32 +#: wasa2il/templates/core/polity_detail.html:61 +msgid "New" +msgstr "" + +#: wasa2il/templates/core/polity_detail.html:9 #, fuzzy -msgid "Discussions" -msgstr "Tartışma" +msgid "You are an officer in this polity." +msgstr "There are no topics in this polity!" -#: templates/core/polity_detail.html:276 -msgid "Unseen posts" -msgstr "" +#: wasa2il/templates/core/polity_detail.html:11 +#, fuzzy +msgid "You are a member of this polity." +msgstr "Members of this polity" -#: templates/core/polity_detail.html:299 templates/help/agreement.html:6 +#: wasa2il/templates/core/polity_detail.html:23 +#: wasa2il/templates/core/polity_detail.html:86 +#: wasa2il/templates/help/is/agreement.html:6 msgid "Agreements" msgstr "Agreements" -#: templates/core/polity_detail.html:299 +#: wasa2il/templates/core/polity_detail.html:36 +msgid "Show all new issues" +msgstr "" + +#: wasa2il/templates/core/polity_detail.html:68 +msgid "There are no new issues at the moment." +msgstr "" + +#: wasa2il/templates/core/polity_detail.html:86 msgid "of this polity" msgstr "of this polity" -#: templates/core/polity_detail.html:301 +#: wasa2il/templates/core/polity_detail.html:88 msgid "Here are all of the agreements this polity has arrived at." msgstr "Here are all of the agreements this polity has arrived at." -#: templates/core/polity_detail.html:315 -msgid "Members of this polity" -msgstr "Members of this polity" +#: wasa2il/templates/core/polity_detail.html:99 +#: wasa2il/templates/core/topic_form.html:6 +msgid "New topic" +msgstr "New topic" + +#: wasa2il/templates/core/polity_detail.html:103 +msgid "Show only starred topics" +msgstr "Show only starred topics" -#: templates/core/polity_detail.html:335 -msgid "Users requesting membership" -msgstr "Users requesting membership" +#: wasa2il/templates/core/polity_detail.html:107 +msgid "of discussion" +msgstr "of discussion" -#: templates/core/polity_detail.html:371 -msgid "Leave this polity?" -msgstr "Leave this polity?" +#: wasa2il/templates/core/polity_detail.html:109 +msgid "Topics are thematic categories that contain specific issues." +msgstr "Topics are thematic categories that contain specific issues." -#: templates/core/polity_detail.html:374 -msgid "Are you sure you want to stop being a member of this polity?" -msgstr "Are you sure you want to stop being a member of this polity?" +#: wasa2il/templates/core/polity_detail.html:115 +#: wasa2il/templates/core/topic_detail.html:21 +msgid "Issues" +msgstr "Issues" -#: templates/core/polity_detail.html:376 -msgid "Only members get to participate in the polity's activities." -msgstr "Only members get to participate in the polity's activities." +#: wasa2il/templates/core/polity_detail.html:116 +msgid "Open Issues" +msgstr "Open Issues" -#: templates/core/polity_detail.html:380 -msgid "No, I hit that button by accident" -msgstr "No, I hit that button by accident" +#: wasa2il/templates/core/polity_detail.html:117 +msgid "Voting Issues" +msgstr "Voting Issues" -#: templates/core/polity_detail.html:381 -msgid "Yes, I want to leave this polity." -msgstr "Yes, I want to leave this polity." +#: wasa2il/templates/core/polity_detail.html:138 +msgid "Subpolities" +msgstr "Subpolities" -#: templates/core/polity_list.html:7 +#: wasa2il/templates/core/polity_form.html:6 +#: wasa2il/templates/core/polity_list.html:8 msgid "New polity" msgstr "New polity" -#: templates/core/polity_list.html:10 templates/help/polity.html:6 +#: wasa2il/templates/core/polity_list.html:12 +#: wasa2il/templates/help/is/polity.html:6 msgid "Polities" msgstr "Polities" -#: templates/core/polity_list.html:15 -msgid "Members" -msgstr "Members" - -#: templates/core/topic_detail.html:15 +#: wasa2il/templates/core/topic_detail.html:12 msgid "This topic is delegated." msgstr "" -#: templates/core/topic_detail.html:58 +#: wasa2il/templates/core/topic_detail.html:18 +msgid "List of issues" +msgstr "" + +#: wasa2il/templates/core/topic_detail.html:43 msgid "New discussions" msgstr "New discussions" -#: templates/core/topic_detail.html:75 +#: wasa2il/templates/core/topic_detail.html:48 +msgid "in" +msgstr "in" + +#: wasa2il/templates/core/topic_detail.html:60 #, fuzzy msgid "Followers of this topic" msgstr "Members of this polity" -#: templates/forum/discussion_detail.html:7 +#: wasa2il/templates/core/stub/document_view.html:14 +#: wasa2il/templates/core/stub/document_view.html:85 +msgid "Comparison" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:15 +msgid "Comparison in progress..." +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:84 +msgid "Text" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:89 +msgid "Compared to" +msgstr "" + +#: wasa2il/templates/core/stub/document_view.html:93 +#: wasa2il/templates/core/stub/document_view.html:95 +msgid "predecessor" +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:9 +msgid "This proposal has been accepted by vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:11 +msgid "" +"This content is still merely a proposal and has not yet been accepted by " +"vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:13 +msgid "This proposal has been rejected by vote." +msgstr "" + +#: wasa2il/templates/core/stub/documentcontent_status.html:15 +msgid "This proposal is deprecated. A newer version has taken effect." +msgstr "" + +#: wasa2il/templates/forum/discussion_detail.html:7 #, fuzzy msgid "Back to forum" msgstr "Başa dön" -#: templates/forum/discussion_detail.html:12 +#: wasa2il/templates/forum/discussion_detail.html:12 #, fuzzy msgid "This discussion is closed." msgstr "of discussion" -#: templates/forum/forum_detail.html:8 +#: wasa2il/templates/forum/discussion_form.html:5 +#: wasa2il/templates/forum/forum_form.html:5 +#, fuzzy +msgid "New forum" +msgstr "Yeni dokuman" + +#: wasa2il/templates/forum/forum_detail.html:8 #, fuzzy msgid "New discussion" msgstr "New discussions" -#: templates/forum/forum_detail.html:10 +#: wasa2il/templates/forum/forum_detail.html:10 msgid "Forum:" msgstr "" -#: templates/forum/forum_detail.html:19 +#: wasa2il/templates/forum/forum_detail.html:15 +#, fuzzy +msgid "Discussions" +msgstr "Tartışma" + +#: wasa2il/templates/forum/forum_detail.html:19 msgid "Messages" msgstr "" -#: templates/forum/forum_detail.html:20 +#: wasa2il/templates/forum/forum_detail.html:20 msgid "Participants" msgstr "" -#: templates/forum/forum_detail.html:36 +#: wasa2il/templates/forum/forum_detail.html:36 #, fuzzy msgid "Followers of this forum" msgstr "Members of this polity" -#: templates/forum/forum_form.html:16 +#: wasa2il/templates/forum/forum_form.html:16 msgid "Name:" msgstr "" -#: templates/help/agreement.html:8 +#: wasa2il/templates/help/is/agreement.html:61 #, fuzzy msgid "" "\n" "

                \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

                \n" "

                \n" "There's a lot of \"generally\" in there, because different polities do " @@ -1344,73 +1212,74 @@ msgid "" "

                \n" "

                Conditions of adoption

                \n" "

                \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

                \n" -"

                More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

                More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

                \n" -"

                A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

                A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

                \n" "

                Document structure

                \n" "

                \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

                \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
                \n" "\t

                0047/2010

                \n" "\t

                Written declaration on the establishment of " "European Home-Made Ice Cream Day

                \n" "\t

                The European Parliament,

                \n" -"\t

                —   having regard to Rule 123 of " -"its Rules of Procedure,

                \n" +"\t

                —   having regard to Rule 123 " +"of its Rules of Procedure,

                \n" "\t
                  \n" "\t\t
                1. whereas the quality of food is a distinctive feature of European " "products and home-made ice cream is synonymous \n" "\t\twith quality as far as fresh dairy products are concerned,
                2. \n" -"\t\t
                3. whereas in some areas home-made ice cream is a typical food product " -"in the fresh dairy \n" +"\t\t
                4. whereas in some areas home-made ice cream is a typical food " +"product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
                5. \n" -"\t\t
                6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
                7. \n" +"\t\t
                8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
                9. \n" "\t
                \n" "\t
                  \n" -"\t\t
                1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\t\t
                2. Calls on the Member States to support the quality product that is" +" home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
                3. \n" -"\t\t
                4. Considers it important, to that end, to establish European Home-Made " -"Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\t\t
                5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
                6. \n" +"\t\t
                7. Considers it important, to that end, to establish European Home-" +"Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
                8. \n" +"\t\t
                9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
                10. \n" "\t
                \n" "
                \n" "

                \n" @@ -1419,10 +1288,10 @@ msgstr "" "

                \n" "Polities are groups of people who come " "together to make decisions and enact their will.\n" -"The decisions they make collectively are agreements. An agreement is " -"generally made about a document, which\n" -"generally consists of a list of statements which the members of the polity " -"generally agree to.\n" +"The decisions they make collectively are agreements. An agreement " +"is generally made about a document, which\n" +"generally consists of a list of statements which the members of the " +"polity generally agree to.\n" "

                \n" "

                \n" "There's a lot of \"generally\" in there, because different polities do " @@ -1430,110 +1299,111 @@ msgstr "" "

                \n" "

                Conditions of adoption

                \n" "

                \n" -"Depending on the rules of the polity, different conditions may apply to how " -"an agreement gets accepted.\n" +"Depending on the rules of the polity, different conditions may apply to " +"how an agreement gets accepted.\n" "When an agreement has been accepted under the rules of a polity, it is " "normally said that it has been \"adopted\".\n" -"In the most simple approach, if more than half of the members of the polity " -"who participate in a vote on the matter\n" +"In the most simple approach, if more than half of the members of the " +"polity who participate in a vote on the matter\n" "agree, then the relevant document gets adopted.\n" "

                \n" -"

                More complicated methods might require consensus (everybody agrees), some " -"other amount of support (say, 2/3), or\n" -"there could be a minimum number of members required to cast votes in order " -"for it to be adopted.\n" +"

                More complicated methods might require consensus (everybody agrees), " +"some other amount of support (say, 2/3), or\n" +"there could be a minimum number of members required to cast votes in " +"order for it to be adopted.\n" "

                \n" -"

                A more obscure, but interesting condition, is \"rolling adoption\" - that " -"at every point in time, enough\n" +"

                A more obscure, but interesting condition, is \"rolling adoption\" - " +"that at every point in time, enough\n" "members of the polity must accept the document for it to remain adopted, " "otherwise it becomes \"unadopted\".\n" -"This requires that new members go through previous agreements and acccept or " -"reject them, otherwise they\n" +"This requires that new members go through previous agreements and acccept" +" or reject them, otherwise they\n" "might simply be aged out of the polity.\n" "

                \n" "

                Document structure

                \n" "

                \n" -"Depending on the rules of the polity, an agreement document may have very " -"varying structure. A common example for international treaties is that " +"Depending on the rules of the polity, an agreement document may have very" +" varying structure. A common example for international treaties is that " "documents\n" "consist of references to previous agreements, followed by a list of " "assumptions made by the authors of the agreement, followed by a list of " "declarations\n" -"which the signatory polities agree to. Here is a delightful example - hover over " -"different parts to see what they're for.\n" -"

                \n" +"which the signatory polities agree to. Here" +" is a delightful example - hover over different parts to see what " +"they're for.\n" +"
                \n" "\\t

                0047/2010

                \n" "\\t

                Written declaration on the establishment of " "European Home-Made Ice Cream Day

                \n" "\\t

                The European Parliament,

                \n" -"\\t

                —   having regard to Rule 123 of " -"its Rules of Procedure,

                \n" +"\\t

                —   having regard to Rule 123" +" of its Rules of Procedure,

                \n" "\\t
                  \n" -"\\t\\t
                1. whereas the quality of food is a distinctive feature of European " -"products and home-made ice cream is synonymous \n" +"\\t\\t
                2. whereas the quality of food is a distinctive feature of " +"European products and home-made ice cream is synonymous \n" "\\t\\twith quality as far as fresh dairy products are concerned,
                3. \n" "\\t\\t
                4. whereas in some areas home-made ice cream is a typical food " "product in the fresh dairy \n" "product category and can therefore contribute to the development of such " "areas,
                5. \n" -"\\t\\t
                6. whereas turnover in the home-made ice cream industry in Europe and " -"in other countries is \n" -"continually on the rise, employing an ever increasing number of workers in " -"the sector,
                7. \n" +"\\t\\t
                8. whereas turnover in the home-made ice cream industry in Europe " +"and in other countries is \n" +"continually on the rise, employing an ever increasing number of workers " +"in the sector,
                9. \n" "\\t
                \n" "\\t
                  \n" -"\\t\\t
                1. Calls on the Member States to support the quality product that is " -"home-made ice cream as \n" -"an area of competitiveness for our economies, an important choice to back " -"given the \n" +"\\t\\t
                2. Calls on the Member States to support the quality product that " +"is home-made ice cream as \n" +"an area of competitiveness for our economies, an important choice to back" +" given the \n" "current crisis affecting the dairy sector;
                3. \n" -"\\t\\t
                4. Considers it important, to that end, to establish European Home-" -"Made Ice Cream Day, to \n" -"be celebrated on 24 March, to contribute to the growth of this industry;\n" -"\\t\\t
                5. Instructs its President to forward this declaration, together with " -"the names of the \n" -"signatories, to the governments and parliaments of the Member States.
                6. \n" +"\\t\\t
                7. Considers it important, to that end, to establish European " +"Home-Made Ice Cream Day, to \n" +"be celebrated on 24 March, to contribute to the growth of this " +"industry;
                8. \n" +"\\t\\t
                9. Instructs its President to forward this declaration, together " +"with the names of the \n" +"signatories, to the governments and parliaments of the Member " +"States.
                10. \n" "\\t
                \n" "
                \n" "

                \n" -#: templates/help/agreement.html:64 +#: wasa2il/templates/help/is/agreement.html:64 msgid "The title" msgstr "The title" -#: templates/help/agreement.html:64 +#: wasa2il/templates/help/is/agreement.html:64 msgid "" -"Agreements may have various forms of reference. One is a reference number, " -"which should be unique and cannonical. Another is a human readable title " -"that is descriptive. Some polities might choose not to use either one, but " -"rules around this should generally be decided on." +"Agreements may have various forms of reference. One is a reference " +"number, which should be unique and cannonical. Another is a human " +"readable title that is descriptive. Some polities might choose not to use" +" either one, but rules around this should generally be decided on." msgstr "" -"Agreements may have various forms of reference. One is a reference number, " -"which should be unique and cannonical. Another is a human readable title " -"that is descriptive. Some polities might choose not to use either one, but " -"rules around this should generally be decided on." +"Agreements may have various forms of reference. One is a reference " +"number, which should be unique and cannonical. Another is a human " +"readable title that is descriptive. Some polities might choose not to use" +" either one, but rules around this should generally be decided on." -#: templates/help/agreement.html:65 +#: wasa2il/templates/help/is/agreement.html:65 msgid "The polity" msgstr "The polity" -#: templates/help/agreement.html:65 +#: wasa2il/templates/help/is/agreement.html:65 msgid "" -"Many polities make sure that their agreements contain their name, so as not " -"to be confusing." +"Many polities make sure that their agreements contain their name, so as " +"not to be confusing." msgstr "" -"Many polities make sure that their agreements contain their name, so as not " -"to be confusing." +"Many polities make sure that their agreements contain their name, so as " +"not to be confusing." -#: templates/help/agreement.html:66 +#: wasa2il/templates/help/is/agreement.html:66 msgid "References section" msgstr "References section" -#: templates/help/agreement.html:66 +#: wasa2il/templates/help/is/agreement.html:66 msgid "" "In the references section, a polity may choose to include references to " "previous agreements, or articles in those agreements." @@ -1541,58 +1411,65 @@ msgstr "" "In the references section, a polity may choose to include references to " "previous agreements, or articles in those agreements." -#: templates/help/agreement.html:67 +#: wasa2il/templates/help/is/agreement.html:67 msgid "Assumptions section" msgstr "Assumptions section" -#: templates/help/agreement.html:67 +#: wasa2il/templates/help/is/agreement.html:67 msgid "" -"The assumptions section generally contains a list of assumptions that are " -"being made. Often these are factual references, or slightly more oblique " -"references to previous decisions. Sometimes they're bizzarre statements of " -"opinion, or even, if used incorrectly, declarations of their own right." -msgstr "" -"The assumptions section generally contains a list of assumptions that are " -"being made. Often these are factual references, or slightly more oblique " -"references to previous decisions. Sometimes they're bizzarre statements of " -"opinion, or even, if used incorrectly, declarations of their own right." - -#: templates/help/agreement.html:68 +"The assumptions section generally contains a list of assumptions that are" +" being made. Often these are factual references, or slightly more oblique" +" references to previous decisions. Sometimes they're bizzarre statements " +"of opinion, or even, if used incorrectly, declarations of their own " +"right." +msgstr "" +"The assumptions section generally contains a list of assumptions that are" +" being made. Often these are factual references, or slightly more oblique" +" references to previous decisions. Sometimes they're bizzarre statements " +"of opinion, or even, if used incorrectly, declarations of their own " +"right." + +#: wasa2il/templates/help/is/agreement.html:68 msgid "Declarations section" msgstr "Declarations section" -#: templates/help/agreement.html:68 +#: wasa2il/templates/help/is/agreement.html:68 msgid "" -"This is the meat of the agreement. It contains one or more statements which " -"are considered to be agreed upon by the polity when the document is adopted. " -"One might even call this the law." +"This is the meat of the agreement. It contains one or more statements " +"which are considered to be agreed upon by the polity when the document is" +" adopted. One might even call this the law." msgstr "" -"This is the meat of the agreement. It contains one or more statements which " -"are considered to be agreed upon by the polity when the document is adopted. " -"One might even call this the law." +"This is the meat of the agreement. It contains one or more statements " +"which are considered to be agreed upon by the polity when the document is" +" adopted. One might even call this the law." -#: templates/help/agreement.html:71 templates/help/polity.html:117 -#: templates/help/proposal.html:62 templates/help/wasa2il.html:28 +#: wasa2il/templates/help/is/agreement.html:71 +#: wasa2il/templates/help/is/polity.html:117 +#: wasa2il/templates/help/is/proposal.html:62 msgid "Related help pages" msgstr "Related help pages" -#: templates/help/agreement.html:73 +#: wasa2il/templates/help/is/agreement.html:73 msgid "How does one make a proposal?" msgstr "How does one make a proposal?" -#: templates/help/agreement.html:74 templates/help/index.html:13 -#: templates/help/polity.html:120 templates/help/proposal.html:65 -#: templates/help/wasa2il.html:30 +#: wasa2il/templates/help/is/agreement.html:74 +#: wasa2il/templates/help/is/index.html:13 +#: wasa2il/templates/help/is/polity.html:120 +#: wasa2il/templates/help/is/proposal.html:65 msgid "How does electronic democracy work?" msgstr "How does electronic democracy work?" -#: templates/help/authors.html:8 +#: wasa2il/templates/help/is/authors.html:50 msgid "" "\n" "

                Developers:

                \n" "
                  \n" "
                • Smári McCarthy
                • \n" "
                • Tómas Árni Jónasson
                • \n" +"
                • Helgi Hrafn Gunnarsson
                • \n" +"
                • Björn Leví Gunnarsson
                • \n" +"
                • Bjarni Rúnar Einarsson
                • \n" "
                \n" "

                Contributors:

                \n" "
                  \n" @@ -1601,6 +1478,10 @@ msgid "" "
                • Zineb Belmkaddem
                • \n" "
                • Þórgnýr Thoroddssen
                • \n" "
                • Stefán Vignir Skarphéðinsson
                • \n" +"
                • Jóhann Haukur Gunnarsson
                • \n" +"
                • Steinn Eldjárn Sigurðarson
                • \n" +"
                • Björgvin Ragnarsson
                • \n" +"
                • Viktor Smári
                • \n" "
                \n" "\n" "

                Translations:

                \n" @@ -1613,7 +1494,7 @@ msgid "" "\n" "

                Icelandic:

                \n" "
                  \n" -"
                • Eva Þurríðardóttir
                • \n" +"
                • Eva Þuríðardóttir
                • \n" "
                • Smári McCarthy
                • \n" "
                • Tómas Árni Jónasson
                • \n" "
                \n" @@ -1625,61 +1506,67 @@ msgid "" "\n" msgstr "" -#: templates/help/copyright.html:6 +#: wasa2il/templates/help/is/copyright.html:6 msgid "Copyright" msgstr "" -#: templates/help/copyright.html:8 +#: wasa2il/templates/help/is/copyright.html:10 msgid "" "\n" "This is free software, licensed under the GNU Affero General Public " "License.\n" msgstr "" -#: templates/help/index.html:8 +#: wasa2il/templates/help/is/index.html:8 msgid "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." msgstr "" -"Hello! Welcome to the Wasa2il help system. Here we will try to help you with " -"all of the problems you might run into when using a direct democracy system." +"Hello! Welcome to the Wasa2il help system. Here we will try to help you " +"with all of the problems you might run into when using a direct democracy" +" system." -#: templates/help/index.html:9 +#: wasa2il/templates/help/is/index.html:9 msgid "" -"If you ever feel like you aren't getting a good enough explanation, please " -"\n" -"Polities are groups of people who come together to make decisions and enact " -"their will.\n" -"These are given various names depending on their form, structure, intent, " -"scale and scope.\n" +"Polities are groups of people who come together to make decisions and " +"enact their will.\n" +"These are given various names depending on their form, structure, intent," +" scale and scope.\n" "Therefore they are variously called \"countries\", \"towns\", \"clubs\", " "\"cabals\", \"mafias\", \"federations\",\n" "\"treaties\", \"unions\", \"associations\", \"companies\", \"phyles\", " @@ -1689,52 +1576,54 @@ msgid "" "

                \n" "The reason we use the word \"polity\" in Wasa2il is that it is the most " "generic term we could\n" -"find. It says nothing of the form, the structure, the intent, scale or scope " -"of the group\n" +"find. It says nothing of the form, the structure, the intent, scale or " +"scope of the group\n" "of people, nor does it preclude anything. Using the word \"group\" could " "work too, but it lacks\n" "the imporant factor that there is an intent to make decisions and enact " "will.\n" "

                \n" "

                \n" -"In addition to consisting of a group of people, a polity will have a set of " -"laws\n" -"the group has decided to adhere to. In an abstract sense, membership in a " -"polity\n" -"grants a person certain rights and priviledges. For instance, membership in " -"a \n" -"school's student body may grant you the right to attend their annual prom,\n" +"In addition to consisting of a group of people, a polity will have a set " +"of laws\n" +"the group has decided to adhere to. In an abstract sense, membership in a" +" polity\n" +"grants a person certain rights and priviledges. For instance, membership " +"in a \n" +"school's student body may grant you the right to attend their annual " +"prom,\n" "and membership in a country (i.e. residency or citizenship) grants you a " "right \n" -"to live there and do certain things there, such as start companies. stand " -"in \n" +"to live there and do certain things there, such as start companies. stand" +" in \n" "elections, and so on.\n" "

                \n" "

                \n" -"Each polity has different rules - these are also called statutes, bylaws or " -"laws - \n" +"Each polity has different rules - these are also called statutes, bylaws " +"or laws - \n" "which affect the polity on two different levels.\n" "

                \n" "

                \n" "Firstly, there are meta-rules, which describe how rules are formed, how\n" -"decisions are made, how meetings happen, and how governance in general \n" +"decisions are made and how governance in general \n" "happens. Wasa2il has to be flexible enough to accomodate the varying \n" -"meta-rules of a given polity, otherwise the polity may decide that Wasa2il " -"isn't \n" -"useful to them. Sometimes these rules are referred to as \"rules of procedure" -"\" \n" -"or \"constitution\", depending on the type of polity which is using them.\n" +"meta-rules of a given polity, otherwise the polity may decide that " +"Wasa2il isn't \n" +"useful to them. Sometimes these rules are referred to as \"rules of " +"procedure\" \n" +"or \"constitution\", depending on the type of polity which is using them." +"\n" "

                \n" "

                \n" -"Secondly there are external rules, which are the decisions the polity makes " -"which\n" +"Secondly there are external rules, which are the decisions the polity " +"makes which\n" "don't affect its internal decisionmaking process.\n" "

                \n" "

                \n" -"It is hard to talk about a term completely in the abstract. We can describe " -"its features, but\n" -"that only gets us so far. So let's look at some of the things that can vary " -"from one polity\n" +"It is hard to talk about a term completely in the abstract. We can " +"describe its features, but\n" +"that only gets us so far. So let's look at some of the things that can " +"vary from one polity\n" "to another, and then take a few examples in each.\n" "

                \n" "

                Scope

                \n" @@ -1746,57 +1635,57 @@ msgid "" "a common interest of its members.\n" "

                \n" "

                \n" -"La Casa Invisible is a social center in Málaga, Spain, which works in " -"the Málaga region\n" -"to promote ideas of social cohesion, autonomy, and democracy. It operates a " -"café, a book store,\n" -"a music hall, and various other projects, each of which could be considered " -"a sub-polity of\n" -"the social center itself. The scope of La Casa Invisible's actions is mostly " -"bound to decisions\n" +"La Casa Invisible is a social center in Málaga, Spain, which works" +" in the Málaga region\n" +"to promote ideas of social cohesion, autonomy, and democracy. It operates" +" a café, a book store,\n" +"a music hall, and various other projects, each of which could be " +"considered a sub-polity of\n" +"the social center itself. The scope of La Casa Invisible's actions is " +"mostly bound to decisions\n" "regarding the social center itself, and the activities that take place " "within it.\n" "

                \n" "

                \n" -"The Union of the Comoros (Udzima wa Komori) is an island nation to " -"the east of Africa, \n" -"just north of Madagascar. It has a population of 798.000 people living in an " -"area of 2.235km². \n" -"The scope of The Comoros as a polity is the land and national waters they " -"control, their airspace,\n" -"and their foreign trade, defense and other agreements they are party to. As " -"such, they have\n" -"municipal sub-polities, and are a member of the African Union, Francophonie, " -"Organization of Islamic\n" -"Cooperation, Arab League and Indian Ocean Commission superpolities, amongst " -"others.\n" +"The Union of the Comoros (Udzima wa Komori) is an island nation to" +" the east of Africa, \n" +"just north of Madagascar. It has a population of 798.000 people living in" +" an area of 2.235km². \n" +"The scope of The Comoros as a polity is the land and national waters they" +" control, their airspace,\n" +"and their foreign trade, defense and other agreements they are party to. " +"As such, they have\n" +"municipal sub-polities, and are a member of the African Union, " +"Francophonie, Organization of Islamic\n" +"Cooperation, Arab League and Indian Ocean Commission superpolities, " +"amongst others.\n" "

                \n" "

                Scale

                \n" "

                \n" "The scale of a polity determines how large it can be expected to become. " "Some polities are specifically\n" -"structured with intent to grow, while others intentionally try to stay at a " -"constant size.\n" +"structured with intent to grow, while others intentionally try to stay at" +" a constant size.\n" "

                \n" "

                \n" -"Muff Divers is a diving club in the village of Muff in Ireland. It " -"claims to be the fastest\n" +"Muff Divers is a diving club in the village of Muff in Ireland. It" +" claims to be the fastest\n" "growing diving club in the world, most likely owing to its name.\n" "

                \n" "

                Intent

                \n" "

                \n" "A polity is created around intent. Some polities intend to take over the " "world, others intend to make\n" -"the nicest cupcakes in all of the land. Some polities intend to send people " -"into space, and others\n" +"the nicest cupcakes in all of the land. Some polities intend to send " +"people into space, and others\n" "intend to track down and arrest criminals. Polities have all sorts of " "motives and intents.\n" "

                \n" "

                \n" "On the most basic level, a polity's intent is a description of what it " "intends to do. This has nothing\n" -"to do with whether the polity has the ability to do it, or whether anybody " -"or anything - such as another\n" +"to do with whether the polity has the ability to do it, or whether " +"anybody or anything - such as another\n" "polity, or the laws of physics - stand in their way.\n" "

                \n" "

                \n" @@ -1806,16 +1695,16 @@ msgid "" "

                \n" "Representative democracy, direct democracy, participatory democracy, " "dictatorship. There are lots of terms\n" -"which describe the structure of a polity. In one sense, it refers to where " -"in the structure of relations\n" +"which describe the structure of a polity. In one sense, it refers to " +"where in the structure of relations\n" "between people the authority lies. In a dictatorship, one person has " "ultimate authority, although he may\n" -"choose to grant some authority downstream to trusted advisors, who in turn " -"have trusted advisors, and so\n" -"on. In a fully egealitarian system, each individual is equipotent, meaning " -"he has an equal ability to\n" -"everybody else to instigate decisions - however, it depends on the structure " -"what ability the individual\n" +"choose to grant some authority downstream to trusted advisors, who in " +"turn have trusted advisors, and so\n" +"on. In a fully egealitarian system, each individual is equipotent, " +"meaning he has an equal ability to\n" +"everybody else to instigate decisions - however, it depends on the " +"structure what ability the individual\n" "has to actually complete the decision making.\n" "

                \n" "

                \n" @@ -1829,37 +1718,37 @@ msgid "" "

                \n" msgstr "" -#: templates/help/proposal.html:6 +#: wasa2il/templates/help/is/proposal.html:6 msgid "Proposals" msgstr "Proposals" -#: templates/help/proposal.html:8 +#: wasa2il/templates/help/is/proposal.html:60 #, fuzzy msgid "" "\n" "

                \n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

                \n" "

                \n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

                \n" "

                \n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -1867,14 +1756,14 @@ msgid "" "

                \n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

                \n" "

                Proposing a new agreement

                \n" "

                \n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

                \n" "

                Proposing changes to a previous agreement

                \n" "

                \n" @@ -1888,10 +1777,10 @@ msgid "" "

                \n" "

                Making changes to a proposal

                \n" "

                \n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

                  \n" "\t
                1. Remove a clause/statement from the document
                2. \n" "\t
                3. Move a clause/statement within the document
                4. \n" @@ -1902,8 +1791,9 @@ msgid "" "

                  \n" "

                  Voting on a proposal

                  \n" "

                  \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " @@ -1914,26 +1804,26 @@ msgstr "" "

                  \n" "Before members of a polity can reach an agreement, somebody needs to\n" -"propose something to be agreed upon. There are many ways in which a proposal " -"can come about - such as through a lone member\n" +"propose something to be agreed upon. There are many ways in which a " +"proposal can come about - such as through a lone member\n" "thinking about a problem, a group of people working together to solve a " "problem, or couple of people brainstorming. Exactly\n" "how people come up with ideas isn't really as important, for this " "discussion, as what happens after the idea has come up.\n" "

                  \n" "

                  \n" -"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" -"one or more of the topics that the polity is " -"interested in. \n" +"In Wasa2il, a user who realizes a problem can raise an issue in his polity. The issue belongs in\n" +"one or more of the topics that the polity is" +" interested in. \n" "

                  \n" "

                  \n" -"Depending on the purpose of the polity, a particular issue might not even be " -"appropriate - for instance, if your polity \n" -"is a golf club, it would be strange to raise an issue relating to a tennis " -"court on the other side of town. A good rule \n" -"of thumb is, if there isn't a topic that your issue belongs in, then it's " -"likely that the issue doesn't belong in the\n" +"Depending on the purpose of the polity, a particular issue might not even" +" be appropriate - for instance, if your polity \n" +"is a golf club, it would be strange to raise an issue relating to a " +"tennis court on the other side of town. A good rule \n" +"of thumb is, if there isn't a topic that your issue belongs in, then it's" +" likely that the issue doesn't belong in the\n" "polity. If you think that it is, perhaps you should raise the issue that " "there are too few or overly narrow topics in \n" "your polity!\n" @@ -1941,14 +1831,14 @@ msgstr "" "

                  \n" "Once an issue has been raised, there are two things that happen. First, " "members of the polity can discuss the issue. Secondly,\n" -"members of the polity can work on a solution. The discussion is covered more " -"thoroughly elsewhere. Here, we focus on the\n" +"members of the polity can work on a solution. The discussion is covered " +"more thoroughly elsewhere. Here, we focus on the\n" "juicy bit: proposals!\n" "

                  \n" "

                  Proposing a new agreement

                  \n" "

                  \n" -"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" +"In order to propose a new agreement, one makes a document and attaches it to the issue.\n" "

                  \n" "

                  Proposing changes to a previous agreement

                  \n" "

                  \n" @@ -1962,10 +1852,10 @@ msgstr "" "

                  \n" "

                  Making changes to a proposal

                  \n" "

                  \n" -"When somebody has made a proposal, members of the polity might agree with it " -"in general but disagree with some specific points,\n" -"or think the wording or language needs some clean up. There are really only " -"four kinds of changes that are possible:\n" +"When somebody has made a proposal, members of the polity might agree with" +" it in general but disagree with some specific points,\n" +"or think the wording or language needs some clean up. There are really " +"only four kinds of changes that are possible:\n" "

                    \n" "\\t
                  1. Remove a clause/statement from the document
                  2. \n" "\\t
                  3. Move a clause/statement within the document
                  4. \n" @@ -1976,23 +1866,25 @@ msgstr "" "

                    \n" "

                    Voting on a proposal

                    \n" "

                    \n" -"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the polity.\n" +"In order for a proposal to be accepted, it needs to be voted on in accordance with the rules of the " +"polity.\n" "Before the entire proposal can be voted on, the polity first needs to " "resolve which version of the document it is voting on. This\n" "is done by voting on all of the change proposals to the proposal " "individually first.\n" "

                    \n" -#: templates/help/wasa2il.html:8 +#: wasa2il/templates/help/is/wasa2il.html:26 msgid "" "\n" "

                    \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

                    \n" "

                    \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2002,24 +1894,25 @@ msgid "" "goals and mutual understandings.\n" "

                    \n" "

                    \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

                    \n" msgstr "" "\n" "

                    \n" -"Wasa2il is a participatory democracy software project. It is based around " -"the core\n" -"idea of polities - political entities - which users of the system can join " -"or leave, \n" -"make proposals in, alter existing proposals, and adopt laws to self-govern.\n" +"Wasa2il is a participatory democracy software project. It is based around" +" the core\n" +"idea of polities - political entities - which users of the system can " +"join or leave, \n" +"make proposals in, alter existing proposals, and adopt laws to self-" +"govern.\n" "

                    \n" "

                    \n" "The goal of this is to make it easy for groups on any scale - from the " @@ -2029,80 +1922,276 @@ msgstr "" "goals and mutual understandings.\n" "

                    \n" "

                    \n" -"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it means " -"\"means\" - the\n" -"ability to accomplish something. The first part of the word, \"wasa\", means " -"\"liquid\", which\n" -"appropriately describes the concept of liquid democracy. We like this mish-" -"mash of meaning,\n" -"but if it doesn't mean much to you, don't worry - it's just a name. You can " -"call it \"Bob\"\n" +"The word \"wasa2il\" (pronounced \"wasa'il\") is from Arabic, where it " +"means \"means\" - the\n" +"ability to accomplish something. The first part of the word, \"wasa\", " +"means \"liquid\", which\n" +"appropriately describes the concept of liquid democracy. We like this " +"mish-mash of meaning,\n" +"but if it doesn't mean much to you, don't worry - it's just a name. You " +"can call it \"Bob\"\n" "for all we care.\n" "

                    \n" -#: templates/registration/activate.html:5 +#: wasa2il/templates/registration/activate.html:5 msgid "Welcome to Wasa2il!" msgstr "Welcome to Wasa2il!" -#: templates/registration/activate.html:6 +#: wasa2il/templates/registration/activate.html:6 msgid "You are now successfully signed up. Sign in to start having fun!" msgstr "You are now successfully signed up. Sign in to start having fun!" -#: templates/registration/login.html:6 +#: wasa2il/templates/registration/activation_complete.html:7 +msgid "Email verified!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:11 +msgid "Congratulations, your email has been verified!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:12 +msgid "You may now try to log in!" +msgstr "" + +#: wasa2il/templates/registration/activation_complete.html:13 +#: wasa2il/templates/registration/login.html:22 +msgid "Login" +msgstr "" + +#: wasa2il/templates/registration/activation_email.txt:2 +msgid "Please click the link below to verify your email address." +msgstr "" + +#: wasa2il/templates/registration/activation_email.txt:6 +#, python-format +msgid "This link will be active for %(expiration_days)s days." +msgstr "" + +#: wasa2il/templates/registration/activation_email_subject.txt:2 +#: wasa2il/templates/registration/registration_complete.html:7 +msgid "Email verification" +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:3 +msgid "" +"As of February 12th 2014, we require the verification of all user " +"accounts via the so-called Icekey." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:5 +msgid "" +"Please be advised that by registering and verifying your account, you " +"become a member of the Pirate Party of Iceland." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:7 +msgid "" +"Membership of political organizations is considered sensitive information" +" by law." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:8 +msgid "" +"Therefore, you should keep the following in mind when becoming a member " +"and using our system:" +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:10 +msgid "" +"Your username is publicly visible. If you don't want to be recognized, " +"use a different one than what you use elsewhere." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:11 +msgid "" +"Your profile settings are mostly public, including your " +"display name, image and description. We don't fill that out for you, " +"though." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:12 +msgid "Don't put anything in there that you don't want visible to the public." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:13 +msgid "We do not display your email address in public." +msgstr "" + +#: wasa2il/templates/registration/data_disclaimer.html:14 +msgid "If you have questions or concerns regarding privacy, please email us:" +msgstr "" + +#: wasa2il/templates/registration/login.html:6 +#: wasa2il/templates/registration/registration_form.html:6 msgid "and partake in democracy..." msgstr "" -#: templates/registration/login.html:17 -#: templates/registration/password_reset_complete.html:5 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:5 -#: templates/registration/password_reset_form.html:5 +#: wasa2il/templates/registration/login.html:9 +msgid "" +"If you forgot your username, you can log in or reset your password with " +"your email address or SSN instead." +msgstr "" + +#: wasa2il/templates/registration/login.html:11 +msgid "If problems arise, please send an email to the following email address:" +msgstr "" + +#: wasa2il/templates/registration/login.html:24 +#: wasa2il/templates/registration/password_reset_complete.html:5 +#: wasa2il/templates/registration/password_reset_confirm.html:8 +#: wasa2il/templates/registration/password_reset_done.html:5 +#: wasa2il/templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "" -#: templates/registration/password_change_done.html:7 -msgid "Password changed" +#: wasa2il/templates/registration/logout.html:7 +msgid "Logged out" +msgstr "" + +#: wasa2il/templates/registration/logout.html:10 +msgid "We hope you'll be back soon. It'd be fun!" +msgstr "" + +#: wasa2il/templates/registration/password_change_done.html:11 +msgid "Success! Your password has been changed." +msgstr "" + +#: wasa2il/templates/registration/password_change_done.html:13 +msgid "Back to settings" msgstr "" -#: templates/registration/password_reset_complete.html:7 +#: wasa2il/templates/registration/password_reset_complete.html:7 msgid "Password reset successfully" msgstr "" -#: templates/registration/password_reset_confirm.html:18 +#: wasa2il/templates/registration/password_reset_confirm.html:22 +msgid "Error" +msgstr "" + +#: wasa2il/templates/registration/password_reset_confirm.html:23 msgid "Password reset failed" msgstr "" -#: templates/registration/password_reset_done.html:6 -msgid "Email with password reset instructions has been sent." +#: wasa2il/templates/registration/password_reset_done.html:5 +msgid "Check your email!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:7 +msgid "Email with password reset instructions may have been sent." +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:9 +#: wasa2il/templates/registration/password_reset_form.html:15 +msgid "Hints:" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:11 +msgid "Check your spam folder!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:12 +msgid "" +"If you do not receive an email, try resetting your password with other " +"email addresses you may have used." +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:13 +msgid "" +"For security and privacy reasons, we cannot tell you whether you used the" +" correct email address. Sorry!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_done.html:14 +msgid "Still nothing? Try creating a new account." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: wasa2il/templates/registration/password_reset_email.html:2 #, python-format -msgid "Reset password at %(site_name)s" +msgid "Someone (probably you) requested a password reset at %(site_name)s." +msgstr "" + +#: wasa2il/templates/registration/password_reset_email.html:4 +msgid "If you are unfamiliar with this request, you should ignore this message." +msgstr "" + +#: wasa2il/templates/registration/password_reset_email.html:6 +msgid "To reset your password, please click the following link:" +msgstr "" + +#: wasa2il/templates/registration/password_reset_form.html:5 +msgid "The tricky email question" msgstr "" -#: templates/registration/password_reset_form.html:9 +#: wasa2il/templates/registration/password_reset_form.html:11 msgid "Send password" msgstr "" -#, fuzzy -#~ msgid "Select topics" -#~ msgstr "New topic" +#: wasa2il/templates/registration/password_reset_form.html:17 +msgid "Not sure which email you used? Try them all!" +msgstr "" + +#: wasa2il/templates/registration/password_reset_subject.txt:2 +msgid "Password reset requested" +msgstr "" + +#: wasa2il/templates/registration/registration_complete.html:11 +msgid "" +"Please check your email to find the verification message we have just " +"sent, and click the appropriate link." +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:6 +msgid "Verification error" +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:8 +msgid "" +"The following error occurred during the processing of your account's " +"verification:" +msgstr "" + +#: wasa2il/templates/registration/saml_error.html:14 +msgid "Please try again and if the error persists, contact an administrator." +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:6 +msgid "Multiple accounts detected" +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:8 +msgid "" +"It appears that you already have a different account. Its username and " +"email address are provided below. Please try logging in again using its " +"credentials." +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:9 +msgid "If you have any further problems, please contact an administrator." +msgstr "" -#~ msgid "Back to document list" -#~ msgstr "Doküman listesine dön" +#: wasa2il/templates/registration/verification_duplicate.html:11 +msgid "Username" +msgstr "" + +#: wasa2il/templates/registration/verification_duplicate.html:12 +msgid "Email" +msgstr "" -#~ msgid "View this document" -#~ msgstr "View this document" +#: wasa2il/templates/registration/verification_needed.html:6 +msgid "Verification needed" +msgstr "" -#~ msgid "[Unnumbered proposal]" -#~ msgstr "[Unnumbered proposal]" +#: wasa2il/templates/registration/verification_needed.html:8 +msgid "" +"The account registration process cannot be completed until verification " +"has been provided." +msgstr "" -#~ msgid "Propose alternative" -#~ msgstr "Propose alternative" +#: wasa2il/templates/registration/verification_needed.html:9 +msgid "Please select one of the following options" +msgstr "" -#~ msgid "Add agenda item" -#~ msgstr "Add agenda item" +#: wasa2il/templates/registration/verification_needed.html:11 +msgid "Verify identity" +msgstr "" -#~ msgid "ID" -#~ msgstr "ID" From 4e6f2daa3a7c6e996d38a302bcc4a24637554332 Mon Sep 17 00:00:00 2001 From: Icelandic Pirate Party Admins Date: Thu, 11 Aug 2016 02:33:42 +0000 Subject: [PATCH 145/993] Fix recount bug, where empty ballots caused problems --- core/elections.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/elections.py b/core/elections.py index c6355011..34be9f5b 100644 --- a/core/elections.py +++ b/core/elections.py @@ -84,8 +84,10 @@ def exclude_candidates(self, excluded): def ballots_as_lists(self): for ballot in self.ballots: - yield([candidate for rank, candidate in sorted(ballot) - if candidate not in self.excluded]) + as_list = [candidate for rank, candidate in sorted(ballot) + if candidate not in self.excluded] + if as_list: + yield(as_list) def ballots_as_rankings(self): b = self.ballots_as_lists() if (self.collapse_gaps) else self.ballots From d6e12968ab7161001393c9a47561a381cf539c26 Mon Sep 17 00:00:00 2001 From: Icelandic Pirate Party Admins Date: Fri, 12 Aug 2016 01:05:22 +0000 Subject: [PATCH 146/993] Show as new issues and elections that ended within the last week --- core/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/views.py b/core/views.py index 7ea59c55..b7e9144a 100644 --- a/core/views.py +++ b/core/views.py @@ -461,8 +461,8 @@ def get_context_data(self, *args, **kwargs): ctx['user_is_member'] = self.object.is_member(self.request.user) ctx["politytopics"] = self.object.get_topic_list(self.request.user) ctx["delegation"] = self.object.get_delegation(self.request.user) - ctx["newissues"] = self.object.issue_set.order_by("deadline_votes").filter(deadline_votes__gt=datetime.now())[:20] - ctx["newelections"] = self.object.election_set.filter(deadline_votes__gt=datetime.now())[:10] + ctx["newissues"] = self.object.issue_set.order_by("deadline_votes").filter(deadline_votes__gt=datetime.now() - timedelta(days=7))[:20] + ctx["newelections"] = self.object.election_set.filter(deadline_votes__gt=datetime.now() - timedelta(days=7))[:10] ctx["settings"] = settings # ctx["delegations"] = Delegate.objects.filter(user=self.request.user, polity=self.object) From 6750939c84a3852507d59d0f90856494bc529aed Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Fri, 12 Aug 2016 15:33:09 +0000 Subject: [PATCH 147/993] Allow candidates to request "any seat below X". --- core/elections.py | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/core/elections.py b/core/elections.py index c6355011..cd070c41 100644 --- a/core/elections.py +++ b/core/elections.py @@ -195,6 +195,21 @@ def results(self, method, winners=None): else: raise Exception('Invalid voting method: %s' % method) + def constrained_results(self, method, winners=None, below=None): + results = self.results(method, winners=winners) + if not below: + return results + + constrained = ['' for i in range(0, len(results) * 2)] + for candidate in results: + position = max(0, below.get(candidate, 1) - 1) + for p in range(position, len(constrained)): + if not constrained[p]: + constrained[p] = candidate + break + + return [c for c in constrained if c] + if __name__ == "__main__": import sys @@ -207,6 +222,8 @@ def results(self, method, winners=None): ap = argparse.ArgumentParser() ap.add_argument('-e', '--exclude', action='append', help="Candidate(s) to exclude when counting") + ap.add_argument('-b', '--below', action='append', + help="seat,candidate pairs, to constrain final ordering") ap.add_argument('--keep-gaps', action='store_true', help="Preserve gaps if ballots are not sequential") ap.add_argument('operation', @@ -233,14 +250,24 @@ def results(self, method, winners=None): bc.collapse_gaps = False if (args.keep_gaps) else True + below = {} + for sc in args.below or []: + seat, candidate = sc.split(',') + seat = int(seat) + below[candidate] = seat + if args.operation == 'count': print('Voting system:\n\t%s (%s)' % (bc.system_name(system), system)) print('') - print('Loaded %d ballots from:\n\t%s' % (len(bc.ballots), - '\n\t'.join(args.filenames))) + print('Loaded %d ballots from:\n\t%s' % ( + len(bc.ballots), '\n\t'.join(args.filenames))) print('') - print('Results:\n\t%s' % ', '.join(bc.results(system, - winners=winners))) + if below: + print('Results(C):\n\t%s' % ', '.join(bc.constrained_results( + system, winners=winners, below=below))) + else: + print('Results:\n\t%s' % ', '.join(bc.results( + system, winners=winners))) print('') else: From 7b1d51f6b0484be5eac7412f97a97ea2adf13c6a Mon Sep 17 00:00:00 2001 From: Viktor Smari Date: Sat, 13 Aug 2016 21:57:47 +0200 Subject: [PATCH 148/993] Fix top menu right margin issue, was close to edge --- wasa2il/templates/base.html | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/wasa2il/templates/base.html b/wasa2il/templates/base.html index f2883533..cb6b3a07 100644 --- a/wasa2il/templates/base.html +++ b/wasa2il/templates/base.html @@ -34,7 +34,6 @@ background-color: #FAFAFA; background-image: url("/static/img/header-bg.png"); background-repeat: repeat-x; - vertical-align: center; height: 75px; } .navbar .navbar-brand { @@ -72,8 +71,8 @@ {% block head_extra %}{% endblock %} -

                    -
                    - -
                    +
                    + +
                    {% block content %}{% endblock %}

                    @@ -144,8 +143,6 @@
                    -
                - From f9fba50001ed9ab052bc7b84d7f7a752dce99e3d Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Mon, 15 Aug 2016 10:52:35 +0000 Subject: [PATCH 149/993] Fix potential stcom buglet, tweak exclusion and recount code --- core/elections.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/elections.py b/core/elections.py index cd070c41..051411b2 100644 --- a/core/elections.py +++ b/core/elections.py @@ -39,7 +39,7 @@ def __init__(self, ballots=None): Ballots should be a list of lists of (rank, candidate) tuples. """ self.ballots = ballots or [] - self.excluded = [] + self.excluded = set([]) self.candidates = self.get_candidates() self.collapse_gaps = True @@ -79,8 +79,9 @@ def get_candidates(self): return candidates.keys() def exclude_candidates(self, excluded): - self.excluded = excluded + self.excluded |= set(excluded) self.candidates = self.get_candidates() + return self def ballots_as_lists(self): for ballot in self.ballots: @@ -122,6 +123,10 @@ def schulze_results_new(self, winners=None): def schulze_results(self, winners=None): """Wrapper to canary new schulze code, comparing with old""" + if self.excluded: + logger.warning('Schulze old cannot exclude, using new only.') + return self.schulze_results_new(winners=winners) + old_style = self.schulze_results_old() new_style = self.schulze_results_new(winners=winners) if old_style != new_style: @@ -157,7 +162,7 @@ def condorcet_results(self): else: return [] - def stcom_results(self): + def stcom_results(self, winners=None): """Icelandic Pirate party steering committee elections. Returns 10 or 11 members; the first five are the steering committee, From f4101b35538efcfd0bfbfba53dd1a3f2cd60676d Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Mon, 15 Aug 2016 10:53:13 +0000 Subject: [PATCH 150/993] Add logic to preserve/restore BallotCounter internal state --- core/elections.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/core/elections.py b/core/elections.py index 051411b2..f912101f 100644 --- a/core/elections.py +++ b/core/elections.py @@ -1,3 +1,4 @@ +import copy import json import logging import random @@ -42,6 +43,30 @@ def __init__(self, ballots=None): self.excluded = set([]) self.candidates = self.get_candidates() self.collapse_gaps = True + self.states = [] + + def copy_state(self): + """Return a copy of the internal state, so we can restore later.""" + return (copy.deepcopy(self.ballots), copy.deepcopy(self.excluded)) + + def restore_state(self, state): + self.ballots = copy.deepcopy(state[0]) + self.excluded = copy.deepcopy(state[1]) + self.candidates = self.get_candidates() + + def push_state(self): + self.states.append(self.copy_state()) + return self + + def pop_state(self): + self.restore_state(self.states.pop(-1)) + return self + + def __enter__(self): + return self.push_state() + + def __exit__(self, *args, **kwargs): + return self.pop_state() def system_name(self, system): return [n for m, n in self.VOTING_SYSTEMS if m == system][0] From 40620a046b7428895ecfc71cbe3e7eb6cd647443 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Mon, 15 Aug 2016 10:54:06 +0000 Subject: [PATCH 151/993] Make schulze_new the default, disable canary by default --- core/elections.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/elections.py b/core/elections.py index f912101f..7a220337 100644 --- a/core/elections.py +++ b/core/elections.py @@ -26,6 +26,7 @@ class BallotCounter(object): ('schulze', 'Schulze, Ordered list'), ('schulze_old', 'Schulze, Ordered list (old)'), ('schulze_new', 'Schulze, Ordered list (new)'), + ('schulze_both', 'Schulze, Ordered list (both)'), ('stcom', 'Steering Committee Election'), ('stv1', 'STV, Single winner'), ('stv2', 'STV, Two winners'), @@ -146,7 +147,7 @@ def schulze_results_new(self, winners=None): ballot_notation=Schulze.BALLOT_NOTATION_RANKING, ).as_dict()['order'] - def schulze_results(self, winners=None): + def schulze_results_both(self, winners=None): """Wrapper to canary new schulze code, comparing with old""" if self.excluded: logger.warning('Schulze old cannot exclude, using new only.') @@ -195,7 +196,7 @@ def stcom_results(self, winners=None): is the condorcet winner, if there is one. Note that the 11th result will be a duplicate. """ - result = self.schulze_results(winners=10) + result = self.schulze_results_new(winners=10) stcom = result[:5] deputies = result[5:] condorcet = self.condorcet_results() @@ -205,13 +206,13 @@ def results(self, method, winners=None): assert(method in [system for system, name in self.VOTING_SYSTEMS]) if method == 'schulze': - return self.schulze_results(winners=winners) + return self.schulze_results_new(winners=(winners or sysarg)) elif method == 'schulze_old': return self.schulze_results_old() - elif method == 'schulze_new': - return self.schulze_results_new(winners=winners) + elif method == 'schulze_both': + return self.schulze_results_both(winners=(winners or sysarg)) elif method == 'condorcet': return self.condorcet_results() From d9f8d0183bd3d50ba1831a214a9800c54ca67ec1 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Mon, 15 Aug 2016 10:54:58 +0000 Subject: [PATCH 152/993] Add experimental "stonethor" method; STV partition + Schulze ranking --- core/elections.py | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/core/elections.py b/core/elections.py index 7a220337..774b2808 100644 --- a/core/elections.py +++ b/core/elections.py @@ -33,7 +33,8 @@ class BallotCounter(object): ('stv3', 'STV, Three winners'), ('stv4', 'STV, Four winners'), ('stv5', 'STV, Five winners'), - ('stv10', 'STV, Ten winners') + ('stv10', 'STV, Ten winners'), + ('stonethor', 'STV partition with Schulze ranking') ) def __init__(self, ballots=None): @@ -202,7 +203,26 @@ def stcom_results(self, winners=None): condorcet = self.condorcet_results() return sorted(stcom) + sorted(deputies) + condorcet - def results(self, method, winners=None): + def stonethor_results(self, partition=None, winners=None): + """Experimental combined STV and Schulze method. + + Partition the candidate group using STV and then rank each + partition separately using Schulze. The default partition is + one quarter of the candidate count. + """ + top = self.stv_results(winners=min( + partition or (len(self.candidates) / 4), + len(self.candidates))) + bottom = list(set(self.get_candidates()) - set(top)) + if top: + with self: + top = self.exclude_candidates(bottom).schulze_results_new() + if bottom and len(top) < winners: + with self: + bottom = self.exclude_candidates(top).schulze_results_new() + return (top + bottom)[:winners] + + def results(self, method, winners=None, sysarg=None): assert(method in [system for system, name in self.VOTING_SYSTEMS]) if method == 'schulze': @@ -223,6 +243,9 @@ def results(self, method, winners=None): elif method.startswith('stv'): return self.stv_results(winners=int(method[3:] or 1)) + elif method == 'stonethor': + return self.stonethor_results(winners=winners, partition=sysarg) + else: raise Exception('Invalid voting method: %s' % method) @@ -267,10 +290,10 @@ def constrained_results(self, method, winners=None, below=None): system = args.system if ':' in system: - system, winners = system.split(':') - winners = int(winners) + system, sysarg = system.split(':') + sysarg = int(sysarg) else: - winners = None + sysarg = None bc = BallotCounter() for fn in args.filenames: @@ -295,10 +318,10 @@ def constrained_results(self, method, winners=None, below=None): print('') if below: print('Results(C):\n\t%s' % ', '.join(bc.constrained_results( - system, winners=winners, below=below))) + system, sysarg=sysarg, below=below))) else: print('Results:\n\t%s' % ', '.join(bc.results( - system, winners=winners))) + system, sysarg=sysarg))) print('') else: From 892eb187e64991ba0e9388b203769b9f1bdcfa81 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Thu, 18 Aug 2016 00:56:23 +0000 Subject: [PATCH 153/993] Refactor non-counting code into a parent class --- core/elections.py | 61 +++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/core/elections.py b/core/elections.py index e221b642..8e0ffa99 100644 --- a/core/elections.py +++ b/core/elections.py @@ -16,27 +16,14 @@ logger = logging.getLogger(__name__) -class BallotCounter(object): +class BallotContainer(object): """ - This class contains the results of an election, making it easy to - tally up the results using a few different methods. - """ - VOTING_SYSTEMS = ( - ('condorcet', 'Condorcet'), - ('schulze', 'Schulze, Ordered list'), - ('schulze_old', 'Schulze, Ordered list (old)'), - ('schulze_new', 'Schulze, Ordered list (new)'), - ('schulze_both', 'Schulze, Ordered list (both)'), - ('stcom', 'Steering Committee Election'), - ('stv1', 'STV, Single winner'), - ('stv2', 'STV, Two winners'), - ('stv3', 'STV, Three winners'), - ('stv4', 'STV, Four winners'), - ('stv5', 'STV, Five winners'), - ('stv10', 'STV, Ten winners'), - ('stonethor', 'STV partition with Schulze ranking') - ) + A container for ballots. + Includes convenience methods for loading/saving ballots, saving + or restoring internal state during analysis, and returning the list + of ballots in a few different formats. + """ def __init__(self, ballots=None): """ Ballots should be a list of lists of (rank, candidate) tuples. @@ -70,9 +57,6 @@ def __enter__(self): def __exit__(self, *args, **kwargs): return self.pop_state() - def system_name(self, system): - return [n for m, n in self.VOTING_SYSTEMS if m == system][0] - def load_ballots(self, filename): """Load ballots from disk""" with open(filename, 'r') as fd: @@ -128,8 +112,39 @@ def ballots_as_rankings(self): yield(rankings) def hashes_with_counts(self, ballots): + hashes = {} for ballot in ballots: - yield {"count": 1, "ballot": ballot} + bkey = repr(ballot) + if bkey in hashes: + hashes[bkey]["count"] += 1 + else: + hashes[bkey] = {"count": 1, "ballot": ballot} + return hashes.values() + + +class BallotCounter(BallotContainer): + """ + This class contains the results of an election, making it easy to + tally up the results using a few different methods. + """ + VOTING_SYSTEMS = ( + ('condorcet', 'Condorcet'), + ('schulze', 'Schulze, Ordered list'), + ('schulze_old', 'Schulze, Ordered list (old)'), + ('schulze_new', 'Schulze, Ordered list (new)'), + ('schulze_both', 'Schulze, Ordered list (both)'), + ('stcom', 'Steering Committee Election'), + ('stv1', 'STV, Single winner'), + ('stv2', 'STV, Two winners'), + ('stv3', 'STV, Three winners'), + ('stv4', 'STV, Four winners'), + ('stv5', 'STV, Five winners'), + ('stv10', 'STV, Ten winners'), + ('stonethor', 'STV partition with Schulze ranking') + ) + + def system_name(self, system): + return [n for m, n in self.VOTING_SYSTEMS if m == system][0] def schulze_results_old(self): candidates = self.candidates From b40ed0362e8093e0d00146b7d3e89050a9792587 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Thu, 18 Aug 2016 00:59:28 +0000 Subject: [PATCH 154/993] Add basic analysis tools --- core/elections.py | 64 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/core/elections.py b/core/elections.py index 8e0ffa99..4fd864d2 100644 --- a/core/elections.py +++ b/core/elections.py @@ -122,7 +122,52 @@ def hashes_with_counts(self, ballots): return hashes.values() -class BallotCounter(BallotContainer): +class BallotAnalyzer(BallotContainer): + """ + This class will analyze and return statistics about a set of ballots. + """ + def _cands_and_stats(self): + cands = sorted(self.get_candidates()) + return (cands, { + 'candidates': cands, + 'ballots': len(self.ballots), + }) + + def get_candidate_rank_stats(self): + cands, stats = self._cands_and_stats() + ranks = [[0 for r in cands] for c in cands] + stats['ranking_matrix'] = ranks + for ballot in self.ballots: + for rank, candidate in ballot: + if candidate in cands: + ranks[cands.index(candidate)][int(rank)] += 1 + for ranking in ranks: + r = sum(ranking) + ranking.append(r) + return stats + + def get_candidate_pairwise_stats(self): + cands, stats = self._cands_and_stats() + cmatrix = [[0 for c2 in cands] for c1 in cands] + stats['pairwise_matrix'] = cmatrix + for ranking in self.ballots_as_rankings(): + print '%s' % ranking + for i, c1 in enumerate(cands): + for j, c2 in enumerate(cands): + if ranking.get(c1, 9999999) < ranking.get(c2, 9999999): + cmatrix[i][j] += 1 + return stats + + def get_duplicate_ballots(self): + cands, stats = self._cands_and_stats() + stats['duplicates'] = [] + for cbhash in self.hashes_with_counts(self.ballots): + if cbhash.get("count", 1) > 1: + stats['duplicates'].append(cbhash) + return stats + + +class BallotCounter(BallotAnalyzer): """ This class contains the results of an election, making it easy to tally up the results using a few different methods. @@ -341,6 +386,23 @@ def constrained_results(self, method, winners=None, below=None): system, sysarg=sysarg))) print('') + if args.operation == 'analyze': + stats = {} + for method in (m.strip() for m in system.split(',')): + if method == 'rankings': + stats.update(bc.get_candidate_rank_stats()) + + elif method == 'pairs': + stats.update(bc.get_candidate_pairwise_stats()) + + elif method == 'duplicates': + stats.update(bc.get_duplicate_ballots()) + + else: + raise ValueError('Unknown analysis: %s' % method) + + print('%s' % stats) + else: # Suppress errors in case logging isn't configured elsewhere logger.addHandler(logging.NullHandler()) From b1a41cb3b8a30d9f3bdd35b62f2cadcfa7c00939 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Thu, 18 Aug 2016 11:43:57 +0000 Subject: [PATCH 155/993] election.py analyze: Add ballot stats, simple text output --- core/elections.py | 103 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 96 insertions(+), 7 deletions(-) diff --git a/core/elections.py b/core/elections.py index 4fd864d2..1b4bf45d 100644 --- a/core/elections.py +++ b/core/elections.py @@ -1,3 +1,4 @@ +import datetime import copy import json import logging @@ -133,6 +134,19 @@ def _cands_and_stats(self): 'ballots': len(self.ballots), }) + def get_ballot_stats(self): + cands, stats = self._cands_and_stats() + lengths = {} + for ballot in self.ballots: + l = len(ballot) + lengths[l] = lengths.get(l, 0) + 1 + stats['ballot_lengths'] = lengths + stats['ballot_length_average'] = float(sum( + (k * v) for k, v in lengths.iteritems())) / len(self.ballots) + stats['ballot_length_most_common'] = max( + (v, k) for k, v in lengths.iteritems())[1] + return stats + def get_candidate_rank_stats(self): cands, stats = self._cands_and_stats() ranks = [[0 for r in cands] for c in cands] @@ -151,21 +165,92 @@ def get_candidate_pairwise_stats(self): cmatrix = [[0 for c2 in cands] for c1 in cands] stats['pairwise_matrix'] = cmatrix for ranking in self.ballots_as_rankings(): - print '%s' % ranking for i, c1 in enumerate(cands): for j, c2 in enumerate(cands): if ranking.get(c1, 9999999) < ranking.get(c2, 9999999): cmatrix[i][j] += 1 return stats - def get_duplicate_ballots(self): + def get_duplicate_ballots(self, threshold=None, threshold_pct=None): + if threshold_pct: + threshold = float(threshold_pct) * len(self.ballots) / 100 + elif not threshold: + threshold = 2 + cands, stats = self._cands_and_stats() + stats['duplicate_threshold'] = threshold stats['duplicates'] = [] - for cbhash in self.hashes_with_counts(self.ballots): - if cbhash.get("count", 1) > 1: + for cbhash in self.hashes_with_counts(self.ballots_as_lists()): + if cbhash.get("count", 1) >= threshold: stats['duplicates'].append(cbhash) + stats['duplicates'].sort(key=lambda cbh: -cbh["count"]) return stats + def stats_as_text(self, stats): + lines = [ + '
                ' % (
                +                datetime.datetime.now()),
                +            '',
                +            'Analyzed %d ballots with %d candidates.' % (
                +                stats['ballots'], len(stats['candidates']))]
                +
                +        if 'ballot_lengths' in stats:
                +            bls = min(stats['ballot_lengths'].keys())
                +            bll = max(stats['ballot_lengths'].keys())
                +            blmc = stats['ballot_length_most_common']
                +            lines += ['', 'Ballots:',
                +                '   - Shortest ballot length: %d (%d ballots=%d%%)' % (
                +                    bls,
                +                    stats['ballot_lengths'][bls],
                +                    stats['ballot_lengths'][bls] * 100 / stats['ballots']),
                +                '   - Average ballot length: %.2f' % (
                +                    stats['ballot_length_average'],),
                +                '   - Longest ballot length: %d (%d ballots=%d%%)' % (
                +                    bll,
                +                    stats['ballot_lengths'][bll],
                +                    stats['ballot_lengths'][bll] * 100 / stats['ballots']),
                +                '   - Most common ballot length: %d (%d ballots=%d%%)' % (
                +                    blmc,
                +                    stats['ballot_lengths'][blmc],
                +                    stats['ballot_lengths'][blmc] * 100 / stats['ballots']),
                +                '   - L/B: [%s]' % (' '.join(
                +                    '%d/%d' % (k, stats['ballot_lengths'][k])
                +                        for k in sorted(stats['ballot_lengths'].keys())))]
                +
                +        if stats.get('duplicates'):
                +            lines += ['',
                +                'Frequent ballots: (>= %d occurrances, %d%%)' % (
                +                    stats['duplicate_threshold'],
                +                    (100 * stats['duplicate_threshold']) / stats['ballots'])]
                +            for dup in stats['duplicates']:
                +                lines += ['   - %(count)d times: %(ballot)s' % dup]
                +
                +        if stats.get('ranking_matrix'):
                +            rm = stats['ranking_matrix']
                +            lines += ['',
                +                'Rankings:',
                +                ' %16.16s  %s ANY' % ('CANDIDATE', ' '.join(
                +                    '%3.3s' % (i+1) for i in range(0, len(rm[0])-1)))]
                +            rls = []
                +            for i, candidate in enumerate(stats['candidates']):
                +                rls += [' %16.16s  %s' % (candidate, ' '.join(
                +                    '%3.3s' % v for v in rm[i]))]
                +            rls.sort(key=lambda l: -int(l.strip().split()[-1]))
                +            lines.extend(rls)
                +
                +        if stats.get('pairwise_matrix'):
                +            pm = stats['pairwise_matrix']
                +            lines += ['',
                +                'Pairwise victories:',
                +                ' %16.16s  %s' % ('WINNER', ' '.join(
                +                    '%3.3s' % c for c in stats['candidates']))]
                +            for i, candidate in enumerate(stats['candidates']):
                +                lines += [' %16.16s  %s' % (candidate, ' '.join(
                +                    '%3.3s' % v for v in pm[i]))]
                +
                +        lines += ['', '%s
                ' % (' ' * 60,)] + return '\n'.join(lines) + class BallotCounter(BallotAnalyzer): """ @@ -386,7 +471,7 @@ def constrained_results(self, method, winners=None, below=None): system, sysarg=sysarg))) print('') - if args.operation == 'analyze': + if args.operation in ('analyze', ): stats = {} for method in (m.strip() for m in system.split(',')): if method == 'rankings': @@ -396,12 +481,16 @@ def constrained_results(self, method, winners=None, below=None): stats.update(bc.get_candidate_pairwise_stats()) elif method == 'duplicates': - stats.update(bc.get_duplicate_ballots()) + stats.update(bc.get_duplicate_ballots(threshold_pct=5)) + + elif method == 'ballots': + stats.update(bc.get_ballot_stats()) else: raise ValueError('Unknown analysis: %s' % method) - print('%s' % stats) + if args.operation == 'analyze': + print(bc.stats_as_text(stats)) else: # Suppress errors in case logging isn't configured elsewhere From 6589257b739e163b02ad0aadaf6d9f6bb958269c Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Thu, 18 Aug 2016 21:08:09 +0000 Subject: [PATCH 156/993] Charset fixes --- core/elections.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/elections.py b/core/elections.py index 1b4bf45d..8de708bb 100644 --- a/core/elections.py +++ b/core/elections.py @@ -188,7 +188,7 @@ def get_duplicate_ballots(self, threshold=None, threshold_pct=None): def stats_as_text(self, stats): lines = [ - '
                ' % (
                +            '
                ' % (
                                 datetime.datetime.now()),
                             '',
                             'Analyzed %d ballots with %d candidates.' % (
                @@ -464,11 +464,11 @@ def constrained_results(self, method, winners=None, below=None):
                             len(bc.ballots), '\n\t'.join(args.filenames)))
                         print('')
                         if below:
                -            print('Results(C):\n\t%s' % ', '.join(bc.constrained_results(
                -                system, sysarg=sysarg, below=below)))
                +            print(('Results(C):\n\t%s' % ', '.join(bc.constrained_results(
                +                system, sysarg=sysarg, below=below))).encode('utf-8'))
                         else:
                -            print('Results:\n\t%s' % ', '.join(bc.results(
                -                system, sysarg=sysarg)))
                +            print(('Results:\n\t%s' % ', '.join(bc.results(
                +                system, sysarg=sysarg))).encode('utf-8'))
                         print('')
                 
                     if args.operation in ('analyze', ):
                @@ -490,7 +490,7 @@ def constrained_results(self, method, winners=None, below=None):
                                 raise ValueError('Unknown analysis: %s' % method)
                 
                         if args.operation == 'analyze':
                -            print(bc.stats_as_text(stats))
                +            print(bc.stats_as_text(stats).encode('utf-8')
                 
                 else:
                     # Suppress errors in case logging isn't configured elsewhere
                
                From 4d40fa39c360825886c5811f3037922028d2ee16 Mon Sep 17 00:00:00 2001
                From: "Bjarni R. Einarsson" 
                Date: Thu, 18 Aug 2016 21:12:36 +0000
                Subject: [PATCH 157/993] Stupid typo
                
                ---
                 core/elections.py | 2 +-
                 1 file changed, 1 insertion(+), 1 deletion(-)
                
                diff --git a/core/elections.py b/core/elections.py
                index 8de708bb..66a714f4 100644
                --- a/core/elections.py
                +++ b/core/elections.py
                @@ -490,7 +490,7 @@ def constrained_results(self, method, winners=None, below=None):
                                 raise ValueError('Unknown analysis: %s' % method)
                 
                         if args.operation == 'analyze':
                -            print(bc.stats_as_text(stats).encode('utf-8')
                +            print(bc.stats_as_text(stats).encode('utf-8'))
                 
                 else:
                     # Suppress errors in case logging isn't configured elsewhere
                
                From 94bf1001662b9797c9d19196e8b300c1e8e3dc44 Mon Sep 17 00:00:00 2001
                From: "Bjarni R. Einarsson" 
                Date: Fri, 19 Aug 2016 01:07:08 +0000
                Subject: [PATCH 158/993] election.py analyze: add support for JSON, XLSX and
                 ODS reports
                
                ---
                 core/elections.py | 88 ++++++++++++++++++++++++++++++++++++++++++-----
                 requirements.txt  |  4 +++
                 2 files changed, 83 insertions(+), 9 deletions(-)
                
                diff --git a/core/elections.py b/core/elections.py
                index 66a714f4..3c4303ff 100644
                --- a/core/elections.py
                +++ b/core/elections.py
                @@ -4,6 +4,7 @@
                 import logging
                 import random
                 import sys
                +from collections import OrderedDict
                 
                 from pyvotecore.schulze_method import SchulzeMethod as Condorcet
                 from pyvotecore.schulze_npr import SchulzeNPR as Schulze
                @@ -129,10 +130,10 @@ class BallotAnalyzer(BallotContainer):
                     """
                     def _cands_and_stats(self):
                         cands = sorted(self.get_candidates())
                -        return (cands, {
                -            'candidates': cands,
                -            'ballots': len(self.ballots),
                -        })
                +        return (cands, OrderedDict([
                +            ('ballots', len(self.ballots)),
                +            ('candidates', cands)
                +        ]))
                 
                     def get_ballot_stats(self):
                         cands, stats = self._cands_and_stats()
                @@ -239,18 +240,74 @@ def stats_as_text(self, stats):
                             lines.extend(rls)
                 
                         if stats.get('pairwise_matrix'):
                -            pm = stats['pairwise_matrix']
                             lines += ['',
                                 'Pairwise victories:',
                                 ' %16.16s  %s' % ('WINNER', ' '.join(
                                     '%3.3s' % c for c in stats['candidates']))]
                             for i, candidate in enumerate(stats['candidates']):
                                 lines += [' %16.16s  %s' % (candidate, ' '.join(
                -                    '%3.3s' % v for v in pm[i]))]
                +                    '%3.3s' % v for v in stats['pairwise_matrix'][i]))]
                 
                         lines += ['', '%s
                ' % (' ' * 60,)] return '\n'.join(lines) + def stats_as_spreadsheet(self, fmt, stats): + pages = OrderedDict() + count = stats['ballots'] + + if 'ballot_lengths' in stats: + bl = stats['ballot_lengths'] + bls = min(bl.keys()) + bll = max(bl.keys()) + blmc = stats['ballot_length_most_common'] + pages['Ballots'] = [ + ['Ballots', count], + [''], + ['', 'Length', 'Ballots', '%'], + ['Shortest', bls, bl[bls], 100.0 * bl[bls] / count], + ['Longest', bll, bl[bll], 100.0 * bl[bll] / count], + ['Average', stats['ballot_length_average'], '', ''], + ['Most common', blmc, bl[blmc], 100.0 * bl[blmc] / count], + [''], + ['Ballot length', 'Ballots'] + ] + sorted([ + [l, stats['ballot_lengths'][l]] + for l in stats['ballot_lengths']]) + + if stats.get('duplicates'): + pages['Duplicates'] = page = [ + ['Frequent ballots: (>= %d occurrances, %d%%)' % ( + stats['duplicate_threshold'], + (100 * stats['duplicate_threshold']) / stats['ballots'])], + [''], + ['Count', 'Ballot ...']] + for dup in stats['duplicates']: + page += [[dup["count"]] + dup['ballot']] + + if stats.get('ranking_matrix'): + rm = stats['ranking_matrix'] + pages['Rankings'] = page = [ + ['CANDIDATE'] + + [(i+1) for i in range(0, len(rm[0])-1)] + + ['ANY']] + rls = [] + for i, candidate in enumerate(stats['candidates']): + rls.append([candidate] + rm[i]) + rls.sort(key=lambda l: -l[-1]) + page.extend(rls) + + if stats.get('pairwise_matrix'): + pages['Pairwise Victories'] = page = [ + ['WINNER'] + stats['candidates']] + for i, candidate in enumerate(stats['candidates']): + page.append([candidate] + stats['pairwise_matrix'][i]) + + import pyexcel + import StringIO + buf = StringIO.StringIO() + pyexcel.Book(sheets=pages).save_to_memory(fmt, stream=buf) + return buf.getvalue() + class BallotCounter(BallotAnalyzer): """ @@ -471,9 +528,13 @@ def constrained_results(self, method, winners=None, below=None): system, sysarg=sysarg))).encode('utf-8')) print('') - if args.operation in ('analyze', ): - stats = {} - for method in (m.strip() for m in system.split(',')): + elif args.operation in ( + 'analyze', 'analyze:json', 'analyze:ods', 'analyze:xlsx'): + + stats = OrderedDict() + if system == 'all': + system = 'ballots,duplicates,rankings,pairs' + for method in (m.strip() for m in system.lower().split(',')): if method == 'rankings': stats.update(bc.get_candidate_rank_stats()) @@ -492,6 +553,15 @@ def constrained_results(self, method, winners=None, below=None): if args.operation == 'analyze': print(bc.stats_as_text(stats).encode('utf-8')) + elif args.operation == 'analyze:json': + json.dump(stats, sys.stdout, indent=1) + + elif args.operation in ('analyze:ods', 'analyze:xlsx'): + sys.stdout.write(bc.stats_as_spreadsheet( + args.operation.split(':')[1], stats)) + + else: + raise ValueError('Unknown operation: %s' % args.operation) else: # Suppress errors in case logging isn't configured elsewhere logger.addHandler(logging.NullHandler()) diff --git a/requirements.txt b/requirements.txt index e0ec1ee0..880ca98f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,3 +27,7 @@ signxml==0.6.0 six==1.10.0 suds==0.4 python-vote-full==1.0 +texttable==0.8.4 +pyexcel-xlsx==0.2.1 +pyexcel-ods==0.2.0 +pyexcel==0.2.4 From 2819f8e672893b629375b8c2e320581c0938158f Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Fri, 19 Aug 2016 01:25:33 +0000 Subject: [PATCH 159/993] elections.py analyze: Add ability to suppress candidate stats --- core/elections.py | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/core/elections.py b/core/elections.py index 3c4303ff..ca11e9c3 100644 --- a/core/elections.py +++ b/core/elections.py @@ -187,6 +187,25 @@ def get_duplicate_ballots(self, threshold=None, threshold_pct=None): stats['duplicates'].sort(key=lambda cbh: -cbh["count"]) return stats + def exclude_candidate_stats(self, stats, excluded): + ltd = copy.deepcopy(stats) + + if ltd.get('ranking_matrix'): + rm = ltd['ranking_matrix'] + for i, c in enumerate(ltd['candidates']): + if c in excluded: + rm[i] = ['' for c in rm[i]] + + if ltd.get('pairwise_matrix'): + rm = ltd['pairwise_matrix'] + for i, c in enumerate(ltd['candidates']): + if c in excluded: + rm[i] = ['' for c in rm[i]] + for l in rm: + l[i] = '' + + return ltd + def stats_as_text(self, stats): lines = [ '
                ' % (
                @@ -236,7 +255,13 @@ def stats_as_text(self, stats):
                             for i, candidate in enumerate(stats['candidates']):
                                 rls += [' %16.16s  %s' % (candidate, ' '.join(
                                     '%3.3s' % v for v in rm[i]))]
                -            rls.sort(key=lambda l: -int(l.strip().split()[-1]))
                +
                +            def safe_int(i):
                +                try:
                +                    return int(i)
                +                except ValueError:
                +                    return 0
                +            rls.sort(key=lambda l: -safe_int(l.strip().split()[-1]))
                             lines.extend(rls)
                 
                         if stats.get('pairwise_matrix'):
                @@ -293,7 +318,7 @@ def stats_as_spreadsheet(self, fmt, stats):
                             rls = []
                             for i, candidate in enumerate(stats['candidates']):
                                 rls.append([candidate] + rm[i])
                -            rls.sort(key=lambda l: -l[-1])
                +            rls.sort(key=lambda l: -(l[-1] or 0))
                             page.extend(rls)
                 
                         if stats.get('pairwise_matrix'):
                @@ -503,9 +528,6 @@ def constrained_results(self, method, winners=None, below=None):
                     for fn in args.filenames:
                         bc.load_ballots(fn)
                 
                -    if args.exclude:
                -        bc.exclude_candidates(args.exclude)
                -
                     bc.collapse_gaps = False if (args.keep_gaps) else True
                 
                     below = {}
                @@ -515,6 +537,9 @@ def constrained_results(self, method, winners=None, below=None):
                         below[candidate] = seat
                 
                     if args.operation == 'count':
                +        if args.exclude:
                +            bc.exclude_candidates(args.exclude)
                +
                         print('Voting system:\n\t%s (%s)' % (bc.system_name(system), system))
                         print('')
                         print('Loaded %d ballots from:\n\t%s' % (
                @@ -550,6 +575,9 @@ def constrained_results(self, method, winners=None, below=None):
                             else:
                                 raise ValueError('Unknown analysis: %s' % method)
                 
                +        if args.exclude:
                +            stats = bc.exclude_candidate_stats(stats, args.exclude)
                +
                         if args.operation == 'analyze':
                             print(bc.stats_as_text(stats).encode('utf-8'))
                 
                
                From 05fed58df0ae356351622cc05fe8a0c7af71cade Mon Sep 17 00:00:00 2001
                From: "Bjarni R. Einarsson" 
                Date: Fri, 19 Aug 2016 16:39:58 +0000
                Subject: [PATCH 160/993] Create manage.py lookup_usernames to help with
                 recounts
                
                ---
                 core/management/commands/lookup_usernames.py | 27 ++++++++++++++++++++
                 1 file changed, 27 insertions(+)
                 create mode 100644 core/management/commands/lookup_usernames.py
                
                diff --git a/core/management/commands/lookup_usernames.py b/core/management/commands/lookup_usernames.py
                new file mode 100644
                index 00000000..f91c2be1
                --- /dev/null
                +++ b/core/management/commands/lookup_usernames.py
                @@ -0,0 +1,27 @@
                +# -*- coding: utf-8 -*-
                +#
                +# This comment will look up a list of usernames, returning names.
                +#
                +from django.contrib.auth.models import User
                +from django.core.management.base import BaseCommand
                +
                +from core.models import *
                +
                +
                +class Command(BaseCommand):
                +
                +    def add_arguments(self, parser):
                +        parser.add_argument('username', nargs='+', action='append')
                +
                +    def handle(self, *args, **options):
                +        count = 1
                +        for usernames in options.get('username', [[]])[0]:
                +            for u in (un.strip() for un in usernames.split(',')):
                +                if u.endswith(','):
                +                    u = u[:-1]
                +                try:
                +                    name = User.objects.get(username=u).get_name()
                +                except:
                +                    name = '[no such user]'
                +                print '%d. %s (%s)' % (count, name, u)
                +                count += 1
                
                From c3307e1cd601ef70d6624a01d523d1510bdfab32 Mon Sep 17 00:00:00 2001
                From: "Bjarni R. Einarsson" 
                Date: Wed, 24 Aug 2016 00:10:52 +0000
                Subject: [PATCH 161/993] Avoid deprecated warning
                
                ---
                 core/ajax/issue.py | 7 ++++---
                 1 file changed, 4 insertions(+), 3 deletions(-)
                
                diff --git a/core/ajax/issue.py b/core/ajax/issue.py
                index d72cf1e4..238866ba 100644
                --- a/core/ajax/issue.py
                +++ b/core/ajax/issue.py
                @@ -10,7 +10,7 @@
                 @login_required
                 @jsonize
                 def issue_vote(request):
                -    issue = int(request.REQUEST.get("issue", 0))
                +    issue = int(request.POST.get("issue", request.GET.get("issue", 0)))
                     issue = get_object_or_404(Issue, id=issue)
                 
                     if not issue.is_voting():
                @@ -19,7 +19,7 @@ def issue_vote(request):
                     if not issue.can_vote(user=request.user):
                         return issue_poll(request)
                 
                -    val = int(request.REQUEST.get("vote", 0))
                +    val = int(request.POST.get("vote", request.GET.get("vote", 0)))
                 
                     (vote, created) = Vote.objects.get_or_create(user=request.user, issue=issue)
                     vote.value = val
                @@ -43,7 +43,8 @@ def issue_comment_send(request):
                 
                 @jsonize
                 def issue_poll(request):
                -    issue = get_object_or_404(Issue, id=request.REQUEST.get("issue", 0))
                +    issue = int(request.POST.get("issue", request.GET.get("issue", 0)))
                +    issue = get_object_or_404(Issue, id=issue)
                     ctx = {}
                     comments = [{"id": comment.id, "created_by": comment.created_by.username, "created": str(comment.created), "created_since": timesince(comment.created), "comment": comment.comment} for comment in issue.comment_set.all().order_by("created")]
                     documents = []
                
                From 2e5ff08ef57317bb785ed130eabce5e875aa6ea6 Mon Sep 17 00:00:00 2001
                From: "Bjarni R. Einarsson" 
                Date: Wed, 24 Aug 2016 00:11:43 +0000
                Subject: [PATCH 162/993] Minor cleanup in lookup_usernames and elections.py
                 analyze
                
                ---
                 core/elections.py                            | 53 +++++++++++---------
                 core/management/commands/lookup_usernames.py |  4 +-
                 2 files changed, 29 insertions(+), 28 deletions(-)
                
                diff --git a/core/elections.py b/core/elections.py
                index ca11e9c3..c169cb80 100644
                --- a/core/elections.py
                +++ b/core/elections.py
                @@ -144,8 +144,17 @@ def get_ballot_stats(self):
                         stats['ballot_lengths'] = lengths
                         stats['ballot_length_average'] = float(sum(
                             (k * v) for k, v in lengths.iteritems())) / len(self.ballots)
                -        stats['ballot_length_most_common'] = max(
                -            (v, k) for k, v in lengths.iteritems())[1]
                +
                +        def ls(l):
                +            return {
                +                "length": l,
                +                "count": lengths[l],
                +                "pct": float(100 * lengths[l]) / len(self.ballots)}
                +        stats['ballot_length_most_common'] = ls(max(
                +            (v, k) for k, v in lengths.iteritems())[1])
                +        stats['ballot_length_longest'] = ls(max(lengths.keys()))
                +        stats['ballot_length_shortest'] = ls(min(lengths.keys()))
                +
                         return stats
                 
                     def get_candidate_rank_stats(self):
                @@ -187,6 +196,7 @@ def get_duplicate_ballots(self, threshold=None, threshold_pct=None):
                         stats['duplicates'].sort(key=lambda cbh: -cbh["count"])
                         return stats
                 
                +    @classmethod
                     def exclude_candidate_stats(self, stats, excluded):
                         ltd = copy.deepcopy(stats)
                 
                @@ -206,33 +216,25 @@ def exclude_candidate_stats(self, stats, excluded):
                 
                         return ltd
                 
                +    @classmethod
                     def stats_as_text(self, stats):
                         lines = [
                -            '
                ' % (
                +            '
                ' % (
                                 datetime.datetime.now()),
                             '',
                             'Analyzed %d ballots with %d candidates.' % (
                                 stats['ballots'], len(stats['candidates']))]
                 
                         if 'ballot_lengths' in stats:
                -            bls = min(stats['ballot_lengths'].keys())
                -            bll = max(stats['ballot_lengths'].keys())
                -            blmc = stats['ballot_length_most_common']
                             lines += ['', 'Ballots:',
                -                '   - Shortest ballot length: %d (%d ballots=%d%%)' % (
                -                    bls,
                -                    stats['ballot_lengths'][bls],
                -                    stats['ballot_lengths'][bls] * 100 / stats['ballots']),
                -                '   - Average ballot length: %.2f' % (
                -                    stats['ballot_length_average'],),
                -                '   - Longest ballot length: %d (%d ballots=%d%%)' % (
                -                    bll,
                -                    stats['ballot_lengths'][bll],
                -                    stats['ballot_lengths'][bll] * 100 / stats['ballots']),
                -                '   - Most common ballot length: %d (%d ballots=%d%%)' % (
                -                    blmc,
                -                    stats['ballot_lengths'][blmc],
                -                    stats['ballot_lengths'][blmc] * 100 / stats['ballots']),
                +                ('   - Average ballot length: %.2f'
                +                     ) % stats['ballot_length_average'],
                +                ('   - Shortest ballot length: %(length)d (%(count)d '
                +                        'ballots=%(pct)d%%)') % stats['ballot_length_shortest'],
                +                ('   - Most common ballot length: %(length)d (%(count)d '
                +                        'ballots=%(pct)d%%)') % stats['ballot_length_most_common'],
                +                ('   - Longest ballot length: %(length)d (%(count)d '
                +                        'ballots=%(pct)d%%)') % stats['ballot_length_longest'],
                                 '   - L/B: [%s]' % (' '.join(
                                     '%d/%d' % (k, stats['ballot_lengths'][k])
                                         for k in sorted(stats['ballot_lengths'].keys())))]
                @@ -276,23 +278,24 @@ def safe_int(i):
                         lines += ['', '%s
                ' % (' ' * 60,)] return '\n'.join(lines) + @classmethod def stats_as_spreadsheet(self, fmt, stats): pages = OrderedDict() count = stats['ballots'] if 'ballot_lengths' in stats: bl = stats['ballot_lengths'] - bls = min(bl.keys()) - bll = max(bl.keys()) + bls = stats['ballot_length_shortest'] + bll = stats['ballot_length_longest'] blmc = stats['ballot_length_most_common'] pages['Ballots'] = [ ['Ballots', count], [''], ['', 'Length', 'Ballots', '%'], - ['Shortest', bls, bl[bls], 100.0 * bl[bls] / count], - ['Longest', bll, bl[bll], 100.0 * bl[bll] / count], + ['Shortest', bls['length'], bls['count'], bls['pct']], + ['Longest', bll['length'], bll['count'], bll['pct']], ['Average', stats['ballot_length_average'], '', ''], - ['Most common', blmc, bl[blmc], 100.0 * bl[blmc] / count], + ['Most common', blmc['length'], blmc['count'], blmc['pct']], [''], ['Ballot length', 'Ballots'] ] + sorted([ diff --git a/core/management/commands/lookup_usernames.py b/core/management/commands/lookup_usernames.py index f91c2be1..68a489bc 100644 --- a/core/management/commands/lookup_usernames.py +++ b/core/management/commands/lookup_usernames.py @@ -16,9 +16,7 @@ def add_arguments(self, parser): def handle(self, *args, **options): count = 1 for usernames in options.get('username', [[]])[0]: - for u in (un.strip() for un in usernames.split(',')): - if u.endswith(','): - u = u[:-1] + for u in (un.strip() for un in usernames.split(',') if un): try: name = User.objects.get(username=u).get_name() except: From 485d01ef44568485a16f0b61dc4c72feada26bdd Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Wed, 24 Aug 2016 00:12:40 +0000 Subject: [PATCH 163/993] Allow blanks, to make editing elections in the Django admin less annoying --- core/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/models.py b/core/models.py index b437c247..147268c0 100644 --- a/core/models.py +++ b/core/models.py @@ -799,15 +799,15 @@ class Election(NameSlugBase): polity = models.ForeignKey(Polity) voting_system = models.CharField(max_length=30, verbose_name=_('Voting system'), choices=VOTING_SYSTEMS) deadline_candidacy = models.DateTimeField(verbose_name=_('Deadline for candidacy')) - starttime_votes = models.DateTimeField(verbose_name=_('Start time for votes'), null=True) + starttime_votes = models.DateTimeField(null=True, blank=True, verbose_name=_('Start time for votes')) deadline_votes = models.DateTimeField(verbose_name=_('Deadline for votes')) # This allows one polity to host elections for one or more others, in # particular allowing access to elections based on geographical polities # without residency granting access to participate in all other polity # activities. - voting_polities = models.ManyToManyField(Polity, related_name='remote_election_votes') - candidate_polities = models.ManyToManyField(Polity, related_name='remote_election_candidates') + voting_polities = models.ManyToManyField(Polity, blank=True, related_name='remote_election_votes') + candidate_polities = models.ManyToManyField(Polity, blank=True, related_name='remote_election_candidates') # Sometimes elections may depend on a user having been the organization's member for an X amount of time # This optional field lets the vote counter disregard members who are too new. From 8d82d7b2100537afa6103dd8ea7235e9f5d7d9b5 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Wed, 24 Aug 2016 00:14:44 +0000 Subject: [PATCH 164/993] Add statistics to model, views and templates --- core/models.py | 177 ++++++++++++++++---- core/templatetags/wasa2il.py | 21 +++ core/urls.py | 12 +- core/views.py | 33 +++- wasa2il/templates/core/election_detail.html | 97 ++++++++++- 5 files changed, 299 insertions(+), 41 deletions(-) diff --git a/core/models.py b/core/models.py index 147268c0..4b7c7e78 100644 --- a/core/models.py +++ b/core/models.py @@ -1,5 +1,6 @@ #coding:utf-8 +import json import logging import os import re @@ -816,6 +817,10 @@ class Election(NameSlugBase): instructions = models.TextField(null=True, blank=True, verbose_name=_('Instructions')) + # These are election statistics; + stats = models.TextField(null=True, blank=True, verbose_name=_('Statistics as JSON')) + stats_limit = models.IntegerField(null=True, blank=True, verbose_name=_('Limit how many candidates we publish stats for')) + # An election can only be processed once, since votes are deleted during the process class AlreadyProcessedException(Exception): def __init__(self, message): @@ -841,41 +846,78 @@ def save_ballots(self, ballot_counter): return False return True + def load_archived_ballots(self): + bc = BallotCounter() + if settings.BALLOT_SAVEFILE_FORMAT is not None: + try: + filename = settings.BALLOT_SAVEFILE_FORMAT % { + 'election_id': self.id, + 'voting_system': self.voting_system} + bc.load_ballots(filename) + except: + import traceback + traceback.print_exc() + return bc + @transaction.atomic def process(self): if not self.is_closed(): raise Election.ElectionInProgressException('Election %s is still in progress!' % self) - if self.is_processed: - raise Election.AlreadyProcessedException('Election %s has already been processed!' % self) + if not self.is_processed: + ordered_candidates, ballot_counter = self.process_votes() + vote_count = self.electionvote_set.values('user').distinct().count() - ordered_candidates, ballot_counter = self.process_votes() - vote_count = self.electionvote_set.values('user').distinct().count() + # Save anonymized ballots to a file, so we can recount later + save_failed = not self.save_ballots(ballot_counter) - # Save anonymized ballots to a file, so we can recount later - save_failed = not self.save_ballots(ballot_counter) + # Generate stats before deleting everything. This allows us to + # analyze the voters as well as the ballots. + self.generate_stats() - try: - election_result = ElectionResult.objects.get(election=self) - except ElectionResult.DoesNotExist: - election_result = ElectionResult.objects.create(election=self, vote_count=vote_count) - - election_result.rows.all().delete() - order = 0 - for candidate in ordered_candidates: - order = order + 1 - election_result_row = ElectionResultRow() - election_result_row.election_result = election_result - election_result_row.candidate = candidate - election_result_row.order = order - election_result_row.save() - - # Delete the original votes (for anonymity), we have the ballots elsewhere - if not save_failed: - self.electionvote_set.all().delete() - - self.is_processed = True - self.save() + try: + election_result = ElectionResult.objects.get(election=self) + except ElectionResult.DoesNotExist: + election_result = ElectionResult.objects.create(election=self, vote_count=vote_count) + + election_result.rows.all().delete() + order = 0 + for candidate in ordered_candidates: + order = order + 1 + election_result_row = ElectionResultRow() + election_result_row.election_result = election_result + election_result_row.candidate = candidate + election_result_row.order = order + election_result_row.save() + + # Delete the original votes (for anonymity), we have the ballots elsewhere + if not save_failed: + self.electionvote_set.all().delete() + + self.is_processed = True + self.save() + return + + if not self.stats: + # If there are no stats, we may be updating old code; see if + # we can load JSON from disk and calculate things anyway. + if self.generate_stats(): + self.save() + return + + raise Election.AlreadyProcessedException('Election %s has already been processed!' % self) + + def generate_stats(self): + ballot_counter = self.load_archived_ballots() + if ballot_counter.ballots: + stats = {} + stats.update(ballot_counter.get_candidate_rank_stats()) + stats.update(ballot_counter.get_candidate_pairwise_stats()) + stats.update(ballot_counter.get_ballot_stats()) + self.stats = json.dumps(stats) + return True + else: + return False def get_voters(self): if self.voting_polities.count() > 0: @@ -941,7 +983,7 @@ def is_open(self): return not self.is_closed() def voting_start_time(self): - if self.starttime_votes is not None: + if self.starttime_votes not in (None, ""): return max(self.starttime_votes, self.deadline_candidacy) return self.deadline_candidacy @@ -968,6 +1010,84 @@ def is_closed(self): return False + def get_stats(self, user=None, load_users=True, rename_users=False): + """Load stats from the DB and convert to pythonic format. + + We expect stats to change over time, so the function provides + reasonable defaults for everything we care about even if the + JSON turns out to be incomplete. Changes to our stats logic will + not require a schema change, but stats cannot readily be queried. + Pros and cons... + """ + stats = { + 'ranking_matrix': [], + 'pairwise_matrix': [], + 'candidates': [], + 'ballot_lengths': {}, + 'ballots': 0, + 'ballot_length_average': 0, + 'ballot_length_most_common': 0} + + # Parse the stats JSON, if it exists. + try: + stats.update(json.loads(self.stats)) + except: + pass + + # Convert ballot_lengths keys (back) to ints + for k in stats['ballot_lengths'].keys(): + stats['ballot_lengths'][int(k)] = stats['ballot_lengths'][k] + del stats['ballot_lengths'][k] + + # Censor the statistics, if we only want to publish details about + # the top N candidates. + if self.stats_limit: + excluded = set([]) + if not user or not user.is_staff: + excluded |= set(cand.user.username for cand in + self.get_winners()[self.stats_limit:]) + if user and user.username in excluded: + excluded.remove(user.username) + stats = BallotCounter.exclude_candidate_stats(stats, excluded) + + # Convert usernames to users. Let's hope usernames never change! + for i, c in enumerate(stats['candidates']): + try: + if not c: + pass + elif load_users: + stats['candidates'][i] = User.objects.get(username=c) + elif rename_users: + u = User.objects.get(username=c) + stats['candidates'][i] = '%s (%s)' % (u.get_name(), c) + except: + pass + + # Create more accessible representations of the tables + stats['rankings'] = {} + stats['victories'] = {} + for i, c in enumerate(stats['candidates']): + if stats.get('ranking_matrix'): + stats['rankings'][c] = stats['ranking_matrix'][i] + if stats.get('pairwise_matrix'): + stats['victories'][c] = stats['pairwise_matrix'][i] + + return stats + + def get_formatted_stats(self, fmt, user=None): + stats = self.get_stats(user=user, rename_users=True, load_users=False) + if fmt == 'json': + return json.dumps(stats, indent=1) + elif fmt in ('text', 'html'): + return BallotCounter.stats_as_text(stats) + elif fmt in ('xlsx', 'ods'): + return BallotCounter.stats_as_spreadsheet(fmt, stats) + else: + return None + + def get_winners(self): + return [r.candidate for r in self.result.rows.order_by('order')] + def get_candidates(self): ctx = {} ctx["count"] = self.candidate_set.count() @@ -1024,6 +1144,7 @@ class Candidate(models.Model): def __unicode__(self): return u'%s' % self.user.username + class ElectionVote(models.Model): election = models.ForeignKey(Election) user = models.ForeignKey(settings.AUTH_USER_MODEL) diff --git a/core/templatetags/wasa2il.py b/core/templatetags/wasa2il.py index e130e468..79e706f1 100644 --- a/core/templatetags/wasa2il.py +++ b/core/templatetags/wasa2il.py @@ -14,6 +14,27 @@ register = template.Library() +@register.filter +def get_item(dictionary, key): + return dictionary.get(key) + + +@register.filter +def sparkline(variable, skip_last=False): + if isinstance(variable, dict): + pairs = sorted([(k, v) for k, v in variable.iteritems()]) + sparkline = [0] * (pairs[-1][0] + 1) + for i, v in pairs: + sparkline[i] = v + if 0 not in variable and '0' not in variable: + variable = sparkline[1:] + else: + variable = sparkline + if skip_last: + variable = variable[:-1] + return ','.join(str(v) for v in variable) + + @register.filter(name='topicfavorited') def topicfavorited(topic, user): try: diff --git a/core/urls.py b/core/urls.py index 127f9846..6fbe2931 100644 --- a/core/urls.py +++ b/core/urls.py @@ -45,9 +45,13 @@ (r'^polity/(?P\d+)/election/$', cache_page(60*1)(vary_on_headers('Cookie')( ElectionListView.as_view()))), - (r'^polity/(?P\d+)/election/new/$', login_required(ElectionCreateView.as_view())), - (r'^polity/(?P\d+)/election/(?P\d+)/$', ElectionDetailView.as_view()), - (r'^polity/(\d+)/election/(?P\d+)/ballots/$', election_ballots), + (r'^polity/(?P\d+)/election/new/$', + login_required(ElectionCreateView.as_view())), + (r'^polity/(?P\d+)/election/(?P\d+)/$', + ElectionDetailView.as_view()), + (r'^polity/(?P\d+)/election/(?P\d+)/stats-dl/(?P.+)$', + election_stats_download), +# (r'^polity/(\d+)/election/(?P\d+)/ballots/$', election_ballots), (r'^polity/(?P\d+)/edit/$', login_required(UpdateView.as_view(model=Polity, success_url="/polity/%(id)d/"))), (r'^polity/(?P\d+)/(?P\w+)/$', login_required(PolityDetailView.as_view())), @@ -58,7 +62,7 @@ (r'^polity/(?P\d+)/topic/(?P\d+)/edit/$', login_required(UpdateView.as_view(model=Topic, success_url="/polity/%(polity__id)d/topic/%(id)d/"))), (r'^polity/(?P\d+)/topic/(?P\d+)/$', TopicDetailView.as_view()), - # (r'^delegation/(?P\d+)/$', login_required(DetailView.as_view(model=Delegate, context_object_name="delegation"))), +# (r'^delegation/(?P\d+)/$', login_required(DetailView.as_view(model=Delegate, context_object_name="delegation"))), (r'^api/topic/star/$', topic_star), (r'^api/topic/showstarred/$', topic_showstarred), diff --git a/core/views.py b/core/views.py index b7e9144a..f3b719df 100644 --- a/core/views.py +++ b/core/views.py @@ -13,6 +13,7 @@ # SSO done from django.shortcuts import render_to_response, redirect, get_object_or_404 +from django.http import HttpResponse from django.http import HttpResponseRedirect from django.http import HttpResponseBadRequest from django.http import Http404 @@ -668,14 +669,21 @@ def get_context_data(self, *args, **kwargs): self.get_object().can_vote(self.request.user)) if election.is_processed: - election_result = election.result - ordered_candidates = [r.candidate for r in election_result.rows.order_by('order')] - vote_count = election_result.vote_count + ordered_candidates = election.get_winners() + vote_count = election.result.vote_count + statistics = election.get_stats(user=self.request.user) + users = [c.user for c in ordered_candidates] + if self.request.user in users: + user_result = users.index(self.request.user) + 1 + else: + user_result = None else: # Returning nothing! Some voting systems are too slow for us to # calculate results on the fly. ordered_candidates = [] vote_count = election.get_vote_count + statistics = None + user_result = None context_data = super(ElectionDetailView, self).get_context_data(*args, **kwargs) context_data.update( @@ -684,9 +692,11 @@ def get_context_data(self, *args, **kwargs): 'step': self.request.GET.get('step', None), "now": datetime.now().strftime("%d/%m/%Y %H:%I"), 'ordered_candidates': ordered_candidates, + 'statistics': statistics, 'vote_count': vote_count, 'voting_interface_enabled': voting_interface_enabled, 'user_is_member': self.polity.is_member(self.request.user), + 'user_result': user_result, 'facebook_title': '%s (%s)' % (election.name, self.polity.name), 'can_vote': (self.request.user is not None and self.object.can_vote(self.request.user)), @@ -735,6 +745,23 @@ def election_ballots(request, pk=None): raise PermissionDenied +def election_stats_download(request, polity=None, pk=None, filename=None): + election = Election.objects.get(pk=pk) + filetype = filename.split('.')[-1].lower() + assert(filetype in ('json', 'xlsx', 'ods', 'html')) + + response = HttpResponse( + election.get_formatted_stats(filetype, user=request.user), + content_type={ + 'json': 'application/json; charset=utf-8', + 'ods': 'application/vnd.oasis.opendocument.spreadsheet', + 'xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'html': 'text/html; charset=utf-8' + }.get(filetype, 'application/octet-stream')) + + response['Content-Disposition'] = 'attachment; filename="%s"' % filename + return response + def error500(request): return render_to_response('500.html') diff --git a/wasa2il/templates/core/election_detail.html b/wasa2il/templates/core/election_detail.html index 41b2acae..78c0c062 100644 --- a/wasa2il/templates/core/election_detail.html +++ b/wasa2il/templates/core/election_detail.html @@ -24,6 +24,7 @@ table#election_details tr#show_details {display: none;} {% endif %} + {% endblock %} {% block content %} @@ -33,7 +34,12 @@

                {% trans "Election:" %} {{ election.name }}

                {% if election.is_closed %} -
                {% trans "This election is closed." %}
                +
                + {% trans "This election is closed." %} + {% if user_result %}{% blocktrans %} + You ended up in {{user_result}}. place. + {% endblocktrans %}{% endif %} +
                {% elif election.is_voting and not can_vote %}
                {% trans "You cannot vote in this election:" %} @@ -68,7 +74,11 @@

                {% trans "Election:" %} {{ election.name }}

                {{ election.description }}

                +
                +
                +
                +
                @@ -86,10 +96,6 @@

                {% trans "Election:" %} {{ election.name }}

                {% if can_vote %}{% trans "You can vote" %}{% endif %} {% endif %} - -
                {% trans "Voting begins" %}:{{ election.voting_start_time }} ({{ election.voting_start_time|timeuntil }})
                {% trans "Deadline for candidacy" %}:{{ election.deadline_candidacy }} ({{ election.deadline_candidacy|timeuntil }})
                {% trans "Votes" %}:{{ election.get_vote_count }} -
                {% trans "Candidates" %}:{{ election.candidate_set.count }} -
                {% trans "Voting system" %}:{{ election.get_voting_system_display }}
                {% trans "Details ..." %} @@ -97,8 +103,47 @@

                {% trans "Election:" %} {{ election.name }}

                +{% if statistics %} +
                + + + + + + + + +
                {% trans "Candidates" %}:{{ election.candidate_set.count }} +
                {% trans "Votes" %}:{{ election.get_vote_count }} +
                {% trans "Shortest ballot length" %}: + {{ statistics.ballot_length_shortest.length }} + ({{ statistics.ballot_length_shortest.count }} {% trans "ballots" %}, + {{ statistics.ballot_length_shortest.pct|floatformat }}%) +
                {% trans "Average ballot length" %}: + {{ statistics.ballot_length_average|floatformat }} +
                {% trans "Longest ballot length" %}: + {{ statistics.ballot_length_longest.length }} + ({{ statistics.ballot_length_longest.count }} {% trans "ballots" %}, + {{ statistics.ballot_length_longest.pct|floatformat }}%) +
                {% trans "Most common ballot length" %}: + {{ statistics.ballot_length_most_common.length }} + ({{ statistics.ballot_length_most_common.count }} {% trans "ballots" %}, + {{ statistics.ballot_length_most_common.pct|floatformat }}%) +
                {% trans "Ballot lengths" %}: + {% with statistics.ballot_lengths as lengths %} + {{ statistics.ballot_lengths|sparkline }} + {% endwith %} +
                +
                +
                +
                +{% endif %} +{% if statistics %} +
                +{% else %}
                +{% endif %} {% if election.instructions %} {% if not voting_interface_enabled or not election.is_voting or started_voting or step == "vote" %}
                @@ -116,11 +161,28 @@

                {% trans 'Election results' %}

                  {% for candidate in ordered_candidates %} -
                1. + {% if not election.stats_limit or forloop.counter <= election.stats_limit or candidate.user == user or user.is_staff %} +
                2. election.stats_limit %} style="background: #efe;"{% endif %}>
                  {{ candidate.user.get_name }} + {% if statistics %} +
                  + {% with statistics.rankings|get_item:candidate.user as ranking %} + {% for r in ranking %}{% if forloop.last %} + {{r}} votes: + {% endif %}{% endfor %} + + {% endwith %} +
                  + {% endif %} + {% if election.stats_limit and forloop.counter > election.stats_limit %} + {% trans "for your eyes only" %} + {% endif %}
                  + {% else %} +
                3. + {% endif %}
                4. {% endfor %}
                @@ -136,8 +198,26 @@

                {% trans 'Election results' %}

                {% endif %} {% endif %}
                +
                +{% if statistics and election.is_closed %} +
                +

                + {% trans "Download detailed statistics as:" %} + Text, + JSON, + ODS, + XLS
                + + {% trans "Downloads include rankings, pairwise victories and ballot counts." %} + {% if election.stats_limit %}{% with election.stats_limit as limit %}{% blocktrans %} + Details below {{limit}}. place are omitted except for + the candidates themselves and members of staff. + {% endblocktrans %}{% endwith %}{% endif %} + +

                +{% endif %} {% if not election.is_closed %} @@ -321,6 +401,11 @@

                {% trans "Candidates" %} {% trans "running in this election" %} From 4fa4a313a845361f93094b1bc1663ca905def28e Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Wed, 24 Aug 2016 00:15:19 +0000 Subject: [PATCH 165/993] Migration for django admin cleanup and election statistics --- core/migrations/0008_auto_20160822_1842.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 core/migrations/0008_auto_20160822_1842.py diff --git a/core/migrations/0008_auto_20160822_1842.py b/core/migrations/0008_auto_20160822_1842.py new file mode 100644 index 00000000..33782ba7 --- /dev/null +++ b/core/migrations/0008_auto_20160822_1842.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0007_default_language_code'), + ] + + operations = [ + migrations.AddField( + model_name='election', + name='stats', + field=models.TextField(null=True, verbose_name='Statistics as JSON', blank=True), + ), + migrations.AddField( + model_name='election', + name='stats_limit', + field=models.IntegerField(null=True, verbose_name='Limit how many candidates we publish stats for', blank=True), + ), + migrations.AlterField( + model_name='election', + name='candidate_polities', + field=models.ManyToManyField(related_name='remote_election_candidates', to='core.Polity', blank=True), + ), + migrations.AlterField( + model_name='election', + name='starttime_votes', + field=models.DateTimeField(null=True, verbose_name='Start time for votes', blank=True), + ), + migrations.AlterField( + model_name='election', + name='voting_polities', + field=models.ManyToManyField(related_name='remote_election_votes', to='core.Polity', blank=True), + ), + migrations.AlterField( + model_name='election', + name='voting_system', + field=models.CharField(max_length=30, verbose_name='Voting system', choices=[(b'condorcet', b'Condorcet'), (b'schulze', b'Schulze, Ordered list'), (b'schulze_old', b'Schulze, Ordered list (old)'), (b'schulze_new', b'Schulze, Ordered list (new)'), (b'schulze_both', b'Schulze, Ordered list (both)'), (b'stcom', b'Steering Committee Election'), (b'stv1', b'STV, Single winner'), (b'stv2', b'STV, Two winners'), (b'stv3', b'STV, Three winners'), (b'stv4', b'STV, Four winners'), (b'stv5', b'STV, Five winners'), (b'stv10', b'STV, Ten winners'), (b'stonethor', b'STV partition with Schulze ranking')]), + ), + ] From e57554ef496d22bb4e5967271ca5e345f941cf45 Mon Sep 17 00:00:00 2001 From: "Bjarni R. Einarsson" Date: Wed, 24 Aug 2016 00:15:36 +0000 Subject: [PATCH 166/993] Add JQuery sparkline to static resources (for election stats) --- core/static/js/jquery.sparkline.min.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/static/js/jquery.sparkline.min.js diff --git a/core/static/js/jquery.sparkline.min.js b/core/static/js/jquery.sparkline.min.js new file mode 100644 index 00000000..fa616bf9 --- /dev/null +++ b/core/static/js/jquery.sparkline.min.js @@ -0,0 +1,5 @@ +/* jquery.sparkline 2.1.2 - http://omnipotent.net/jquery.sparkline/ +** Licensed under the New BSD License - see above site for details */ + +(function(a,b,c){(function(a){typeof define=="function"&&define.amd?define(["jquery"],a):jQuery&&!jQuery.fn.sparkline&&a(jQuery)})(function(d){"use strict";var e={},f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L=0;f=function(){return{common:{type:"line",lineColor:"#00f",fillColor:"#cdf",defaultPixelsPerValue:3,width:"auto",height:"auto",composite:!1,tagValuesAttribute:"values",tagOptionsPrefix:"spark",enableTagOptions:!1,enableHighlight:!0,highlightLighten:1.4,tooltipSkipNull:!0,tooltipPrefix:"",tooltipSuffix:"",disableHiddenCheck:!1,numberFormatter:!1,numberDigitGroupCount:3,numberDigitGroupSep:",",numberDecimalMark:".",disableTooltips:!1,disableInteraction:!1},line:{spotColor:"#f80",highlightSpotColor:"#5f5",highlightLineColor:"#f22",spotRadius:1.5,minSpotColor:"#f80",maxSpotColor:"#f80",lineWidth:1,normalRangeMin:c,normalRangeMax:c,normalRangeColor:"#ccc",drawNormalOnTop:!1,chartRangeMin:c,chartRangeMax:c,chartRangeMinX:c,chartRangeMaxX:c,tooltipFormat:new h(' {{prefix}}{{y}}{{suffix}}')},bar:{barColor:"#3366cc",negBarColor:"#f44",stackedBarColor:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],zeroColor:c,nullColor:c,zeroAxis:!0,barWidth:4,barSpacing:1,chartRangeMax:c,chartRangeMin:c,chartRangeClip:!1,colorMap:c,tooltipFormat:new h(' {{prefix}}{{value}}{{suffix}}')},tristate:{barWidth:4,barSpacing:1,posBarColor:"#6f6",negBarColor:"#f44",zeroBarColor:"#999",colorMap:{},tooltipFormat:new h(' {{value:map}}'),tooltipValueLookups:{map:{"-1":"Loss",0:"Draw",1:"Win"}}},discrete:{lineHeight:"auto",thresholdColor:c,thresholdValue:0,chartRangeMax:c,chartRangeMin:c,chartRangeClip:!1,tooltipFormat:new h("{{prefix}}{{value}}{{suffix}}")},bullet:{targetColor:"#f33",targetWidth:3,performanceColor:"#33f",rangeColors:["#d3dafe","#a8b6ff","#7f94ff"],base:c,tooltipFormat:new h("{{fieldkey:fields}} - {{value}}"),tooltipValueLookups:{fields:{r:"Range",p:"Performance",t:"Target"}}},pie:{offset:0,sliceColors:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],borderWidth:0,borderColor:"#000",tooltipFormat:new h(' {{value}} ({{percent.1}}%)')},box:{raw:!1,boxLineColor:"#000",boxFillColor:"#cdf",whiskerColor:"#000",outlierLineColor:"#333",outlierFillColor:"#fff",medianColor:"#f00",showOutliers:!0,outlierIQR:1.5,spotRadius:1.5,target:c,targetColor:"#4a2",chartRangeMax:c,chartRangeMin:c,tooltipFormat:new h("{{field:fields}}: {{value}}"),tooltipFormatFieldlistKey:"field",tooltipValueLookups:{fields:{lq:"Lower Quartile",med:"Median",uq:"Upper Quartile",lo:"Left Outlier",ro:"Right Outlier",lw:"Left Whisker",rw:"Right Whisker"}}}}},E='.jqstooltip { position: absolute;left: 0px;top: 0px;visibility: hidden;background: rgb(0, 0, 0) transparent;background-color: rgba(0,0,0,0.6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";color: white;font: 10px arial, san serif;text-align: left;white-space: nowrap;padding: 5px;border: 1px solid white;z-index: 10000;}.jqsfield { color: white;font: 10px arial, san serif;text-align: left;}',g=function(){var a,b;return a=function(){this.init.apply(this,arguments)},arguments.length>1?(arguments[0]?(a.prototype=d.extend(new arguments[0],arguments[arguments.length-1]),a._super=arguments[0].prototype):a.prototype=arguments[arguments.length-1],arguments.length>2&&(b=Array.prototype.slice.call(arguments,1,-1),b.unshift(a.prototype),d.extend.apply(d,b))):a.prototype=arguments[0],a.prototype.cls=a,a},d.SPFormatClass=h=g({fre:/\{\{([\w.]+?)(:(.+?))?\}\}/g,precre:/(\w+)\.(\d+)/,init:function(a,b){this.format=a,this.fclass=b},render:function(a,b,d){var e=this,f=a,g,h,i,j,k;return this.format.replace(this.fre,function(){var a;return h=arguments[1],i=arguments[3],g=e.precre.exec(h),g?(k=g[2],h=g[1]):k=!1,j=f[h],j===c?"":i&&b&&b[i]?(a=b[i],a.get?b[i].get(j)||j:b[i][j]||j):(n(j)&&(d.get("numberFormatter")?j=d.get("numberFormatter")(j):j=s(j,k,d.get("numberDigitGroupCount"),d.get("numberDigitGroupSep"),d.get("numberDecimalMark"))),j)})}}),d.spformat=function(a,b){return new h(a,b)},i=function(a,b,c){return ac?c:a},j=function(a,c){var d;return c===2?(d=b.floor(a.length/2),a.length%2?a[d]:(a[d-1]+a[d])/2):a.length%2?(d=(a.length*c+c)/4,d%1?(a[b.floor(d)]+a[b.floor(d)-1])/2:a[d-1]):(d=(a.length*c+2)/4,d%1?(a[b.floor(d)]+a[b.floor(d)-1])/2:a[d-1])},k=function(a){var b;switch(a){case"undefined":a=c;break;case"null":a=null;break;case"true":a=!0;break;case"false":a=!1;break;default:b=parseFloat(a),a==b&&(a=b)}return a},l=function(a){var b,c=[];for(b=a.length;b--;)c[b]=k(a[b]);return c},m=function(a,b){var c,d,e=[];for(c=0,d=a.length;c0;h-=c)a.splice(h,0,e);return a.join("")},o=function(a,b,c){var d;for(d=b.length;d--;){if(c&&b[d]===null)continue;if(b[d]!==a)return!1}return!0},p=function(a){var b=0,c;for(c=a.length;c--;)b+=typeof a[c]=="number"?a[c]:0;return b},r=function(a){return d.isArray(a)?a:[a]},q=function(b){var c;a.createStyleSheet?a.createStyleSheet().cssText=b:(c=a.createElement("style"),c.type="text/css",a.getElementsByTagName("head")[0].appendChild(c),c[typeof a.body.style.WebkitAppearance=="string"?"innerText":"innerHTML"]=b)},d.fn.simpledraw=function(b,e,f,g){var h,i;if(f&&(h=this.data("_jqs_vcanvas")))return h;if(d.fn.sparkline.canvas===!1)return!1;if(d.fn.sparkline.canvas===c){var j=a.createElement("canvas");if(!j.getContext||!j.getContext("2d")){if(!a.namespaces||!!a.namespaces.v)return d.fn.sparkline.canvas=!1,!1;a.namespaces.add("v","urn:schemas-microsoft-com:vml","#default#VML"),d.fn.sparkline.canvas=function(a,b,c,d){return new J(a,b,c)}}else d.fn.sparkline.canvas=function(a,b,c,d){return new I(a,b,c,d)}}return b===c&&(b=d(this).innerWidth()),e===c&&(e=d(this).innerHeight()),h=d.fn.sparkline.canvas(b,e,this,g),i=d(this).data("_jqs_mhandler"),i&&i.registerCanvas(h),h},d.fn.cleardraw=function(){var a=this.data("_jqs_vcanvas");a&&a.reset()},d.RangeMapClass=t=g({init:function(a){var b,c,d=[];for(b in a)a.hasOwnProperty(b)&&typeof b=="string"&&b.indexOf(":")>-1&&(c=b.split(":"),c[0]=c[0].length===0?-Infinity:parseFloat(c[0]),c[1]=c[1].length===0?Infinity:parseFloat(c[1]),c[2]=a[b],d.push(c));this.map=a,this.rangelist=d||!1},get:function(a){var b=this.rangelist,d,e,f;if((f=this.map[a])!==c)return f;if(b)for(d=b.length;d--;){e=b[d];if(e[0]<=a&&e[1]>=a)return e[2]}return c}}),d.range_map=function(a){return new t(a)},u=g({init:function(a,b){var c=d(a);this.$el=c,this.options=b,this.currentPageX=0,this.currentPageY=0,this.el=a,this.splist=[],this.tooltip=null,this.over=!1,this.displayTooltips=!b.get("disableTooltips"),this.highlightEnabled=!b.get("disableHighlight")},registerSparkline:function(a){this.splist.push(a),this.over&&this.updateDisplay()},registerCanvas:function(a){var b=d(a.canvas);this.canvas=a,this.$canvas=b,b.mouseenter(d.proxy(this.mouseenter,this)),b.mouseleave(d.proxy(this.mouseleave,this)),b.click(d.proxy(this.mouseclick,this))},reset:function(a){this.splist=[],this.tooltip&&a&&(this.tooltip.remove(),this.tooltip=c)},mouseclick:function(a){var b=d.Event("sparklineClick");b.originalEvent=a,b.sparklines=this.splist,this.$el.trigger(b)},mouseenter:function(b){d(a.body).unbind("mousemove.jqs"),d(a.body).bind("mousemove.jqs",d.proxy(this.mousemove,this)),this.over=!0,this.currentPageX=b.pageX,this.currentPageY=b.pageY,this.currentEl=b.target,!this.tooltip&&this.displayTooltips&&(this.tooltip=new v(this.options),this.tooltip.updatePosition(b.pageX,b.pageY)),this.updateDisplay()},mouseleave:function(){d(a.body).unbind("mousemove.jqs");var b=this.splist,c=b.length,e=!1,f,g;this.over=!1,this.currentEl=null,this.tooltip&&(this.tooltip.remove(),this.tooltip=null);for(g=0;g