Commit a770378f authored by Benjamin Sonntag's avatar Benjamin Sonntag

merge of local changes

parent f60f3668
[extractors]
django = babeldjango.extract:extract_django
[django: templates/**.*]
[django: templates/*.*]
[django: templates/comments/*.*]
[python: bt/**.py]
......@@ -31,6 +31,7 @@ COUNTRIES = (
('FI', _('Finland')),
('SE', _('Sweden')),
('UK', _('United Kingdom ')),
('NO', _('Norway')),
)
RESOURCES = (
......
......@@ -51,8 +51,8 @@ def activate(request):
if v:
actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
to=[x.email for x in User.objects.filter(groups__name='moderator')]
msg = MIMEText(_("A new report was submitted. To approve click here: %s/moderate/?key=%s\n") % (settings.ROOT_URL or 'http://localhost:8001/', actid))
msg['Subject'] = _('NNMon submission approval')
msg = MIMEText(_("A new report was submitted. To approve click here: %s/moderate/?key=%s\n") % (settings.ROOT_URL or 'http://localhost:8001/', actid), _charset="utf-8")
msg['Subject'] = _('NNMon submission approval').encode("Utf-8")
msg['From'] = 'nnmon@nnmon.lqdn.fr'
msg['To'] = ', '.join(to)
s = smtplib.SMTP('localhost')
......@@ -60,7 +60,7 @@ def activate(request):
s.quit()
v.activationid=actid
v.save()
messages.add_message(request, messages.INFO, _('Thank you for verifying your submission. It will be listed shortly, after we\'ve checked that the report is valid.'))
messages.add_message(request, messages.INFO, _('Thank you for verifying your submission. It will be listed shortly, after we\'ve checked that the report is valid.').encode("Utf-8"))
return HttpResponseRedirect('/') # Redirect after POST
def moderate(request):
......@@ -106,8 +106,8 @@ def confirm(request, id, name=None):
def sendverifymail(service,to):
actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
msg = MIMEText(_("Thank you for submitting a new report. To finalize your submission please confirm using your validation key.\nYour verification key is %s/%s%s\nPlease note that reports are moderated, it might take some time before your report appears online. Thank you for your patience.") % (settings.ROOT_URL or 'http://localhost:8001/', service, actid))
msg['Subject'] = _('NNMon submission verification')
msg = MIMEText(_("Thank you for submitting a new report. To finalize your submission please confirm using your validation key.\nYour verification key is %s/%s%s\nPlease note that reports are moderated, it might take some time before your report appears online. Thank you for your patience.") % (settings.ROOT_URL or 'http://localhost:8001/', service, actid), _charset="utf-8")
msg['Subject'] = _('NNMon submission verification').encode("Utf-8")
msg['From'] = 'nnmon@nnmon.lqdn.fr'
msg['To'] = to
s = smtplib.SMTP('localhost')
......
# Bulgarian translations for PROJECT.
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2011-09-22 17:44+0200\n"
"PO-Revision-Date: 2011-09-22 01:00+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: bg <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.6\n"
#: bt/forms.py:20
msgid "EU member state where the restriction is reported."
msgstr ""
#: bt/forms.py:21
msgid "The ISP or operator providing the Internet service."
msgstr ""
#: bt/forms.py:22
msgid ""
"The specific contract at the ISP provider. (please be as specific as "
"possible)"
msgstr ""
#: bt/forms.py:23
msgid "Is the Internet connection over mobile or fixed line?"
msgstr ""
#: bt/forms.py:24
msgid ""
"Please describe the symptoms you are experiencing. What service or site, "
"or person is unavailable or seems artificially slowed down."
msgstr ""
#: bt/forms.py:25
msgid "Email (set this to enable saving)"
msgstr ""
#: bt/forms.py:25
msgid ""
"We need your email to validate your report. Your email address is "
"obligatory, but we will never use your personal data for anything else "
"than checking the submission."
msgstr ""
#: bt/forms.py:26
msgid "Name or nickname"
msgstr ""
#: bt/forms.py:26
msgid "We need some name to display that instead of an email address."
msgstr ""
#: bt/forms.py:27
msgid "Attach screenshot, document or any other relevant information."
msgstr ""
#: bt/forms.py:28
msgid "What is the affected resource. (optional)"
msgstr ""
#: bt/forms.py:29
msgid "Please specify the name of the affected resource. (optional)"
msgstr ""
#: bt/forms.py:30
msgid "Is the Resource Blocked or otherwise discrimated? (optional)"
msgstr ""
#: bt/forms.py:31
msgid ""
"Is the restriction only temporary, e.g. due to network overload? "
"(optional)"
msgstr ""
#: bt/forms.py:32
msgid ""
"Is there another offer provided by this Operator which removes this "
"restriction? (optional)"
msgstr ""
#: bt/forms.py:33
msgid "Is the restriction described in the subscribers contract? (optional)"
msgstr ""
#: bt/forms.py:34
msgid ""
"Please copy the relevant section describing the restriction from the user"
" contract. (optional)"
msgstr ""
#: bt/forms.py:35
msgid ""
"In order to protect against spam, please fill in the result of the "
"following calculation. (note the + and the * are somewhat confusing)"
msgstr ""
#: bt/models.py:6
msgid "Belgium"
msgstr ""
#: bt/models.py:7
msgid "Bulgaria"
msgstr ""
#: bt/models.py:8
msgid "Czech Republic"
msgstr ""
#: bt/models.py:9
msgid "Denmark"
msgstr ""
#: bt/models.py:10
msgid "Germany"
msgstr ""
#: bt/models.py:11
msgid "Estonia"
msgstr ""
#: bt/models.py:12
msgid "Ireland"
msgstr ""
#: bt/models.py:13
msgid "Greece"
msgstr ""
#: bt/models.py:14
msgid "Spain"
msgstr ""
#: bt/models.py:15 templates/about.html:12
msgid "France"
msgstr ""
#: bt/models.py:16
msgid "Italy"
msgstr ""
#: bt/models.py:17
msgid "Cyprus"
msgstr ""
#: bt/models.py:18
msgid "Latvia"
msgstr ""
#: bt/models.py:19
msgid "Lithuania"
msgstr ""
#: bt/models.py:20
msgid "Luxembourg"
msgstr ""
#: bt/models.py:21
msgid "Hungary"
msgstr ""
#: bt/models.py:22
msgid "Malta"
msgstr ""
#: bt/models.py:23 templates/about.html:13
msgid "Netherlands"
msgstr ""
#: bt/models.py:24
msgid "Austria"
msgstr ""
#: bt/models.py:25
msgid "Poland"
msgstr ""
#: bt/models.py:26
msgid "Portugal"
msgstr ""
#: bt/models.py:27
msgid "Romania"
msgstr ""
#: bt/models.py:28
msgid "Slovenia"
msgstr ""
#: bt/models.py:29
msgid "Slovakia"
msgstr ""
#: bt/models.py:30
msgid "Finland"
msgstr ""
#: bt/models.py:31
msgid "Sweden"
msgstr ""
#: bt/models.py:32
msgid "United Kingdom "
msgstr ""
#: bt/models.py:36
msgid "port"
msgstr ""
#: bt/models.py:37
msgid "protocol"
msgstr ""
#: bt/models.py:38
msgid "service"
msgstr ""
#: bt/models.py:39
msgid "site"
msgstr ""
#: bt/models.py:40
msgid "user"
msgstr ""
#: bt/models.py:41
msgid "ip"
msgstr ""
#: bt/models.py:44
msgid "Blocking"
msgstr ""
#: bt/models.py:45
msgid "Throttling"
msgstr ""
#: bt/models.py:48
msgid "Fixed"
msgstr ""
#: bt/models.py:49
msgid "Mobile"
msgstr ""
#: bt/models.py:87
#, python-format
msgid "Comment #%s"
msgstr ""
#: bt/multifile.py:135
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
#: bt/multifile.py:137
msgid "No file was submitted."
msgstr ""
#: bt/multifile.py:141
msgid "The submitted file is empty."
msgstr ""
#: bt/multifile.py:144
msgid "An incorrect number of files were uploaded."
msgstr ""
#: bt/views.py:50 bt/views.py:70
msgid "Thank you, this has been already activated"
msgstr ""
#: bt/views.py:54
#, python-format
msgid "A new report was submitted. To approve click here: %s/moderate/?key=%s\n"
msgstr ""
#: bt/views.py:55
msgid "NNMon submission approval"
msgstr ""
#: bt/views.py:63
msgid ""
"Thank you for verifying your submission. It will be listed shortly, after"
" we've checked that the report is valid."
msgstr ""
#: bt/views.py:72
msgid "No such key"
msgstr ""
#: bt/views.py:77
#, python-format
msgid "New infringement reported for %s (%s) %s"
msgstr ""
#: bt/views.py:82
msgid "Thank you for approving the submission."
msgstr ""
#: bt/views.py:86
msgid "Thank you for deleting the submission."
msgstr ""
#: bt/views.py:97
msgid "Thank you, this has been already confirmed"
msgstr ""
#: bt/views.py:99
msgid "Thank you for your confirmation"
msgstr ""
#: bt/views.py:104
msgid "Thank you for verifying your confirmation"
msgstr ""
#: bt/views.py:109
#, python-format
msgid ""
"Thank you for submitting a new report. To finalize your submission please"
" confirm using your validation key.\n"
"Your verification key is %s/%s%s\n"
"Please note that reports are moderated, it might take some time before "
"your report appears online. Thank you for your patience."
msgstr ""
#: bt/views.py:110
msgid "NNMon submission verification"
msgstr ""
#: bt/views.py:157
msgid ""
"Thank you for submitting this report, you will receive a verification "
"email shortly."
msgstr ""
#: templates/about.html:7
msgid ""
"RespectMyNet.eu is an online platform enabling citizens to become the "
"watchmen of the Internet by reporting Net Neutrality violations. Everyone"
" is invited to report undue blocking or throttling of their Internet "
"access, and help name and shame operators' harmful practices."
msgstr ""
#: templates/about.html:8
msgid ""
"This platform is a joint project by La Quadrature du Net, Bits of Freedom"
" and individual contributors. It was launched on September 22nd, 2011."
msgstr ""
#: templates/about.html:9
msgid ""
"Organisations will submit reports to national and EU regulatory "
"authorities if appropriate."
msgstr ""
#: templates/about.html:10
msgid "For enquiries about the project, please contact:"
msgstr ""
#: templates/add.html:30
msgid "New Violation"
msgstr ""
#: templates/add.html:33 templates/index.html:104
msgid "Provide optional details"
msgstr ""
#: templates/add.html:44 templates/index.html:115
msgid "save"
msgstr ""
#: templates/base.html:28
msgid "Logout"
msgstr ""
#: templates/base.html:30
msgid "Admin"
msgstr ""
#: templates/base.html:32
msgid "Login"
msgstr ""
#: templates/base.html:37
msgid "Home"
msgstr ""
#: templates/base.html:38
msgid "Cases"
msgstr ""
#: templates/base.html:39
msgid "What's Net Neutrality"
msgstr ""
#: templates/base.html:40
msgid "Start Monitoring"
msgstr ""
#: templates/base.html:41
msgid "Contact"
msgstr ""
#: templates/feeditem.html:5 templates/view.html:54
msgid "Description"
msgstr ""
#: templates/feeditem.html:11 templates/view.html:61
msgid "Attachments"
msgstr ""
#: templates/feeditem.html:22 templates/view.html:74
msgid "Media"
msgstr ""
#: templates/feeditem.html:23
msgid "Affected Resource/service"
msgstr ""
#: templates/feeditem.html:24 templates/view.html:73
msgid "Type"
msgstr ""
#: templates/feeditem.html:25 templates/view.html:75
msgid "Temporary restriction"
msgstr ""
#: templates/feeditem.html:25 templates/feeditem.html:27 templates/view.html:76
#: templates/view.html:77
msgid "yes"
msgstr ""
#: templates/feeditem.html:26 templates/view.html:76
msgid "Loophole offering"
msgstr ""
#: templates/feeditem.html:27 templates/view.html:77
msgid "Contractual restriction"
msgstr ""
#: templates/feeditem.html:29 templates/view.html:78
msgid "Contract excerpt"
msgstr ""
#: templates/index.html:101
msgid "Add New Case"
msgstr ""
#: templates/index.html:119
msgid "On Internet, you decide what you do, right? Not anymore!"
msgstr ""
#: templates/index.html:120
msgid ""
"We all rely more and more on our access to Internet to do serious things "
"like find jobs and fun things like chat with friends. But telco's are "
"increasingly trying to control your behavior online, by restricting the "
"things you are doing on the internet. Now you have a chance to do "
"something about that!"
msgstr ""
#: templates/index.html:121
msgid ""
"Help us chart all the ways that internet providers are violating our "
"online freedom: Is your operator blocking or throttling your Internet "
"communications, for instance by making it impossible to use chat programs"
" or charging extra for Internet telephony? Let us know by filling up this"
" form (it takes less than two minutes!). We will make sure that the "
"relevant authorities are informed, so that we can put an end to this."
msgstr ""
#: templates/index.html:122
msgid "Featured Cases"
msgstr ""
#: templates/index.html:126
msgid "Infringing offering"
msgstr ""
#: templates/index.html:127
msgid "Confirmed"
msgstr ""
#: templates/index.html:137 templates/list.html:69
msgid ""
"In order to <strong>validate your confirmation</strong> of this case, "
"please enter your email address"
msgstr ""
#: templates/index.html:139
msgid "ok"
msgstr ""
#: templates/index.html:140 templates/list.html:73
msgid "cancel"
msgstr ""
#: templates/index.html:146
msgid "Confirm"
msgstr ""
#: templates/list.html:41
msgid ""
"This is a list of all reported violations of net neutrality. See <a "
"href='/about'>What is net neutrality</a> for a short explanation. "
msgstr ""
#: templates/list.html:45
msgid "country"
msgstr ""
#: templates/list.html:46
msgid "operator"
msgstr ""
#: templates/list.html:47
msgid "contract"
msgstr ""
#: templates/list.html:48
msgid "resource"
msgstr ""
#: templates/list.html:49
msgid "type"
msgstr ""
#: templates/list.html:50
msgid "fixed / wireless"
msgstr ""
#: templates/list.html:51
msgid "confirmations"
msgstr ""
#: templates/list.html:66 templates/view.html:85
msgid "confirm"
msgstr ""
#: templates/list.html:72
msgid "OK"
msgstr ""
#: templates/nn.html:7
msgid ""
"On the Internet, <strong>you</strong> decide what you do, right? Not "
"anymore!"
msgstr ""
#: templates/nn.html:8
msgid ""
"Large telecommunication providers want to control what you do online. "
"They want to restrict access to internet telephony in order to force you "
"to use their telephone services. They want to charge you for viewing of "
"videos. They want to prohibit the use of specific software on their "
"networks, or throttle innovative applications such as peer-to-peer "
"filesharing."
msgstr ""
#: templates/nn.html:9
msgid ""
"This must stop. We want to ensure that your freedom online is protected "
"and that you decide which content you access, and which applications and "
"services you use. Net neutrality is about your freedom online."
msgstr ""
#: templates/nn.html:10
msgid ""
"Violations on Net Neutrality are bad for freedom of communication, "
"freedom of choice, innovation and communication costs. They lead to a "
"situation where the provider can decide what you do online, not you, and "
"this restricts your freedom. It becomes more difficult for innovative "
"companies to offer their services via the internet, because they may be "
"blocked or slowed down by providers. And it leads to higher communication"
" costs because you may have to pay extra to use cheap services such as "
"internet telephony."
msgstr ""
#: templates/nn.html:11
msgid ""
"We need to ensure that the Internet remains free, open and accessible for"
" all. This is what Net Neutrality is about. The European Commission and "
"national regulators need to prohibit providers from restricting your "
"online traffic and do so before it is too late. In order to convince them"
" about the urgency of this problem, we aim to create a comprehensive "
"report of Net Neutrality violations in Europe. This website is the way to"
" report these violations."
msgstr ""
#: templates/start.html:7
msgid ""
"Do you want to check whether your access provider is manipulating your "
"internet traffic? Great! There are a lot of tools which make life easier "
"for you. Here is a short selection."
msgstr ""
#: templates/start.html:8
msgid "Recommended tools"
msgstr ""
<