Skip to content

GitLab

Commit e5801ef6 authored by Okhin's avatar Okhin
Browse files

Finishing the registering process, and updating the messages

parent 4dc9eded
Hide whitespace changes
Inline Side-by-side
locale/de/LC_MESSAGES/django.po
View file @ e5801ef6
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-02 16:41+0100\n"
"POT-Creation-Date: 2016-03-13 16:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -264,6 +264,10 @@ msgstr ""
msgid "United Kingdom"
msgstr ""
#: bt/models.py:40
msgid "other"
msgstr ""
#: bt/models.py:41
msgid "port"
msgstr ""
......@@ -301,12 +305,12 @@ msgstr ""
msgid "class of application or contraint"
msgstr ""
#: bt/models.py:50
msgid "other"
#: bt/models.py:52
msgid "Zero Rating"
msgstr ""
#: bt/models.py:53
msgid "Zero Rating"
msgid "Specialised Service"
msgstr ""
#: bt/models.py:54
......@@ -322,70 +326,47 @@ msgid "Prioritisation"
msgstr ""
#: bt/models.py:57
msgid "Specialised Service"
msgstr ""
#: bt/models.py:58
msgid "Other"
msgstr ""
#: bt/models.py:61
#: bt/models.py:60
msgid "Fixed"
msgstr ""
#: bt/models.py:62
#: bt/models.py:61
msgid "Mobile"
msgstr ""
#: bt/models.py:65
#: bt/models.py:64
msgid "Need more info"
msgstr ""
#: bt/models.py:66 nnmon/templates/list.html:60
#: bt/models.py:65 nnmon/templates/list.html:61
#: nnmon/templates/search/search.html:81
msgid "New"
msgstr ""
#: bt/models.py:67
#: bt/models.py:66
msgid "Verified"
msgstr ""
#: bt/models.py:68
#: bt/models.py:67
msgid "Duplicate"
msgstr ""
#: bt/models.py:69
#: bt/models.py:68
msgid "Out of scope"
msgstr ""
#: bt/models.py:70
#: bt/models.py:69
msgid "Closed"
msgstr ""
#: bt/models.py:135
#: bt/models.py:134
#, python-format
msgid "Comment #%s"
msgstr ""
#: bt/multifile.py:135
#: env/lib/python2.7/site-packages/django/forms/fields.py:591
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
#: bt/multifile.py:137
#: env/lib/python2.7/site-packages/django/forms/fields.py:592
msgid "No file was submitted."
msgstr ""
#: bt/multifile.py:141
#: env/lib/python2.7/site-packages/django/forms/fields.py:593
msgid "The submitted file is empty."
msgstr ""
#: bt/multifile.py:144
msgid "An incorrect number of files were uploaded."
msgstr ""
#: bt/views.py:61 bt/views.py:85
msgid "Thank you, this key has been already activated"
msgstr ""
......@@ -444,35 +425,25 @@ msgstr ""
msgid "NNMon submission verification"
msgstr ""
#: bt/views.py:153
#, 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:191
#: bt/views.py:192
msgid ""
"Thank you for submitting this report, you will receive a verification email "
"immediately, if not check your spam folder."
msgstr ""
#: bt/views.py:206
#: bt/views.py:207
msgid "Total confirmed reports"
msgstr ""
#: bt/views.py:207 bt/views.py:286
#: bt/views.py:208 bt/views.py:285
msgid "Countries with some confirmed reports"
msgstr ""
#: bt/views.py:208 bt/views.py:287
#: bt/views.py:209 bt/views.py:286
msgid "Operators with some confirmed reports"
msgstr ""
#: bt/views.py:285
#: bt/views.py:284
msgid "Number of reports in this search"
msgstr ""
......@@ -877,6 +848,18 @@ msgstr ""
msgid "Enter a valid duration."
msgstr ""
#: env/lib/python2.7/site-packages/django/forms/fields.py:591
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
#: env/lib/python2.7/site-packages/django/forms/fields.py:592
msgid "No file was submitted."
msgstr ""
#: env/lib/python2.7/site-packages/django/forms/fields.py:593
msgid "The submitted file is empty."
msgstr ""
#: 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)."
......@@ -1902,44 +1885,44 @@ msgstr ""
msgid "Error running spellchecker"
msgstr ""
#: nnmon/templates/base.html:26
#: nnmon/templates/base.html:40
msgid "Report cases of Net Neutrality violations"
msgstr ""
#: nnmon/templates/base.html:31
#: nnmon/templates/base.html:45
msgid "Logout"
msgstr ""
#: nnmon/templates/base.html:33
#: nnmon/templates/base.html:47
msgid "Admin"
msgstr ""
#: nnmon/templates/base.html:37
#: nnmon/templates/base.html:51
msgid "Login"
msgstr ""
#: nnmon/templates/base.html:47
#: nnmon/templates/base.html:61
msgid "Toggle navgation"
msgstr ""
#: nnmon/templates/base.html:57
#: nnmon/templates/base.html:71
msgid "Cases"
msgstr ""
#: nnmon/templates/base.html:58
#: nnmon/templates/base.html:72
msgid "What is Net Neutrality?"
msgstr ""
#: nnmon/templates/base.html:59
#: nnmon/templates/base.html:73
msgid "Start Monitoring"
msgstr ""
#: nnmon/templates/base.html:76 nnmon/templates/list.html:83
#: nnmon/templates/base.html:90 nnmon/templates/list.html:84
#: nnmon/templates/search/search.html:104
msgid "Close"
msgstr ""
#: nnmon/templates/base.html:101
#: nnmon/templates/base.html:115
msgid ""
"RespectMyNet.eu is an online platform enabling citizens to report net "
"neutrality violations. Everyone is invited to report blocking or throttling "
......@@ -1991,31 +1974,31 @@ msgstr ""
msgid "Contract excerpt"
msgstr ""
#: nnmon/templates/index.html:55 nnmon/templates/index.html.py:137
#: nnmon/templates/list.html:69 nnmon/templates/search/search.html:90
#: nnmon/templates/index.html:62 nnmon/templates/index.html.py:146
#: nnmon/templates/list.html:70 nnmon/templates/search/search.html:90
#: nnmon/templates/view.html:114
msgid "Me too!"
msgstr ""
#: nnmon/templates/index.html:59 nnmon/templates/index.html.py:124
#: nnmon/templates/list.html:76 nnmon/templates/search/search.html:97
#: nnmon/templates/index.html:66 nnmon/templates/index.html.py:133
#: nnmon/templates/list.html:77 nnmon/templates/search/search.html:97
#: nnmon/templates/view.html:111
msgid ""
"In order to <strong>confirm</strong> this report, please enter your email "
"address"
msgstr ""
#: nnmon/templates/index.html:62
#: nnmon/templates/index.html:69
msgid "Ok"
msgstr ""
#: nnmon/templates/index.html:90
#: nnmon/templates/index.html:99
msgid ""
"On the Internet, <strong>you</strong> decide what you do, right? <i>Maybe "
"not!</i>"
msgstr ""
#: nnmon/templates/index.html:91
#: nnmon/templates/index.html:100
msgid ""
"Telecommunication providers and Internet companies are trying to control "
"what you do online. They want to block and throttle some of your "
......@@ -2025,66 +2008,66 @@ msgid ""
"this. "
msgstr ""
#: nnmon/templates/index.html:92
#: nnmon/templates/index.html:101
msgid ""
"The EU law recently adopted on Net Neutrality is ambiguous and the telecom "
"regulators have the job of deciding how it should be implemented."
msgstr ""
#: nnmon/templates/index.html:93
#: nnmon/templates/index.html:102
msgid ""
"You can help. You can report Net Neutrality violations and help the "
"regulators protect the open Internet in Europe!"
msgstr ""
#: nnmon/templates/index.html:94
#: nnmon/templates/index.html:103
msgid ""
"Help us keep track of all the ways that Internet providers are violating our "
"online freedoms. Tell us about how your landline or mobile Internet operator "
"restricts your Internet connection. It will take less than two minutes!"
msgstr ""
#: nnmon/templates/index.html:95
#: nnmon/templates/index.html:104
msgid ""
"Don't hesitate to give us feedback on this application by reporting any idea "
"or issue with RespectMyNet.eu here: <a href='https://nnmon.quadpad.lqdn.fr/"
"feedback'>Feedback pad page</a>"
msgstr ""
#: nnmon/templates/index.html:96 nnmon/templates/search/search.html:52
#: nnmon/templates/index.html:105 nnmon/templates/search/search.html:52
msgid "Statistics"
msgstr ""
#: nnmon/templates/index.html:108
#: nnmon/templates/index.html:117
msgid "Featured Cases"
msgstr ""
#: nnmon/templates/index.html:112
#: nnmon/templates/index.html:121
msgid "Infringing offering"
msgstr ""
#: nnmon/templates/index.html:113
#: nnmon/templates/index.html:122
msgid "Confirmed"
msgstr ""
#: nnmon/templates/index.html:129 nnmon/templates/list.html:82
#: nnmon/templates/index.html:138 nnmon/templates/list.html:83
#: nnmon/templates/search/search.html:103
msgid "OK"
msgstr ""
#: nnmon/templates/index.html:130
#: nnmon/templates/index.html:139
msgid "Cancel"
msgstr ""
#: nnmon/templates/index.html:143
#: nnmon/templates/index.html:152
msgid "Affected Resource"
msgstr ""
#: nnmon/templates/index.html:158
#: nnmon/templates/index.html:167
msgid "Add New Case"
msgstr ""
#: nnmon/templates/index.html:170
#: nnmon/templates/index.html:180
msgid ""
"Please report cases of zero-rating (services which are excluded from your "
"download limit), specialised services or the blocking, throttling or "
......@@ -2092,33 +2075,33 @@ msgid ""
"to report, check our <a href='/about/#guidelines'>guidelines</a>."
msgstr ""
#: nnmon/templates/index.html:194
#: nnmon/templates/index.html:204
msgid "save"
msgstr ""
#: nnmon/templates/index.html:201
#: nnmon/templates/index.html:211
msgid "Continue"
msgstr ""
#: nnmon/templates/index.html:212
#: nnmon/templates/index.html:222
msgid "Similar cases"
msgstr ""
#: nnmon/templates/index.html:215
#: nnmon/templates/index.html:225
msgid ""
"Those are cases that might be similar to yours, please feel free to add your "
"input on those cases instead of adding yours if they overlap."
msgstr ""
#: nnmon/templates/index.html:221
#: nnmon/templates/index.html:231
msgid "Dismiss"
msgstr ""
#: nnmon/templates/list.html:37
#: nnmon/templates/list.html:38
msgid "Reported Cases"
msgstr ""
#: nnmon/templates/list.html:39
#: nnmon/templates/list.html:40
msgid ""
"This is a list of all reported cases of Net Neutrality violations by our "
"users. Please note that we do not validate the accuracy of these reports "
......@@ -2129,36 +2112,36 @@ msgid ""
"validated."
msgstr ""
#: nnmon/templates/list.html:46 nnmon/templates/search/search.html:66
#: nnmon/templates/list.html:47 nnmon/templates/search/search.html:66
#: nnmon/templates/view.html:72
msgid "Status"
msgstr ""
#: nnmon/templates/list.html:47 nnmon/templates/search/search.html:67
#: nnmon/templates/list.html:48 nnmon/templates/search/search.html:67
msgid "country"
msgstr ""
#: nnmon/templates/list.html:48 nnmon/templates/search/search.html:68
#: nnmon/templates/list.html:49 nnmon/templates/search/search.html:68
msgid "operator"
msgstr ""
#: nnmon/templates/list.html:49 nnmon/templates/search/search.html:69
#: nnmon/templates/list.html:50 nnmon/templates/search/search.html:69
msgid "contract"
msgstr ""
#: nnmon/templates/list.html:50 nnmon/templates/search/search.html:70
#: nnmon/templates/list.html:51 nnmon/templates/search/search.html:70
msgid "resource"
msgstr ""
#: nnmon/templates/list.html:51 nnmon/templates/search/search.html:71
#: nnmon/templates/list.html:52 nnmon/templates/search/search.html:71
msgid "type"
msgstr ""
#: nnmon/templates/list.html:52 nnmon/templates/search/search.html:72
#: nnmon/templates/list.html:53 nnmon/templates/search/search.html:72
msgid "fixed / wireless"
msgstr ""
#: nnmon/templates/list.html:53 nnmon/templates/search/search.html:73
#: nnmon/templates/list.html:54 nnmon/templates/search/search.html:73
msgid "confirmations"
msgstr ""
......
locale/en/LC_MESSAGES/django.po
View file @ e5801ef6
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-02 16:41+0100\n"
"POT-Creation-Date: 2016-03-13 16:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -263,6 +263,10 @@ msgstr ""
msgid "United Kingdom"
msgstr ""
#: bt/models.py:40
msgid "other"
msgstr ""
#: bt/models.py:41
msgid "port"
msgstr ""
......@@ -300,12 +304,12 @@ msgstr ""
msgid "class of application or contraint"
msgstr ""
#: bt/models.py:50
msgid "other"
#: bt/models.py:52
msgid "Zero Rating"
msgstr ""
#: bt/models.py:53
msgid "Zero Rating"
msgid "Specialised Service"
msgstr ""
#: bt/models.py:54
......@@ -321,70 +325,47 @@ msgid "Prioritisation"
msgstr ""
#: bt/models.py:57
msgid "Specialised Service"
msgstr ""
#: bt/models.py:58
msgid "Other"
msgstr ""
#: bt/models.py:61
#: bt/models.py:60
msgid "Fixed"
msgstr ""
#: bt/models.py:62
#: bt/models.py:61
msgid "Mobile"
msgstr ""
#: bt/models.py:65
#: bt/models.py:64
msgid "Need more info"
msgstr ""
#: bt/models.py:66 nnmon/templates/list.html:60
#: bt/models.py:65 nnmon/templates/list.html:61
#: nnmon/templates/search/search.html:81
msgid "New"
msgstr ""
#: bt/models.py:67
#: bt/models.py:66
msgid "Verified"
msgstr ""
#: bt/models.py:68
#: bt/models.py:67
msgid "Duplicate"
msgstr ""
#: bt/models.py:69
#: bt/models.py:68
msgid "Out of scope"
msgstr ""
#: bt/models.py:70
#: bt/models.py:69
msgid "Closed"
msgstr ""
#: bt/models.py:135
#: bt/models.py:134
#, python-format
msgid "Comment #%s"
msgstr ""
#: bt/multifile.py:135
#: env/lib/python2.7/site-packages/django/forms/fields.py:591
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
#: bt/multifile.py:137
#: env/lib/python2.7/site-packages/django/forms/fields.py:592
msgid "No file was submitted."
msgstr ""
#: bt/multifile.py:141
#: env/lib/python2.7/site-packages/django/forms/fields.py:593
msgid "The submitted file is empty."
msgstr ""
#: bt/multifile.py:144
msgid "An incorrect number of files were uploaded."
msgstr ""
#: bt/views.py:61 bt/views.py:85
msgid "Thank you, this key has been already activated"
msgstr ""
......@@ -443,35 +424,25 @@ msgstr ""
msgid "NNMon submission verification"
msgstr ""
#: bt/views.py:153
#, 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:191
#: bt/views.py:192
msgid ""
"Thank you for submitting this report, you will receive a verification email "
"immediately, if not check your spam folder."
msgstr ""
#: bt/views.py:206
#: bt/views.py:207
msgid "Total confirmed reports"
msgstr ""
#: bt/views.py:207 bt/views.py:286
#: bt/views.py:208 bt/views.py:285
msgid "Countries with some confirmed reports"
msgstr ""
#: bt/views.py:208 bt/views.py:287
#: bt/views.py:209 bt/views.py:286
msgid "Operators with some confirmed reports"
msgstr ""
#: bt/views.py:285
#: bt/views.py:284
msgid "Number of reports in this search"
msgstr ""
......@@ -876,6 +847,18 @@ msgstr ""
msgid "Enter a valid duration."
msgstr ""
#: env/lib/python2.7/site-packages/django/forms/fields.py:591
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
#: env/lib/python2.7/site-packages/django/forms/fields.py:592
msgid "No file was submitted."
msgstr ""
#: env/lib/python2.7/site-packages/django/forms/fields.py:593
msgid "The submitted file is empty."
msgstr ""
#: 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)."
......@@ -1901,44 +1884,44 @@ msgstr ""
msgid "Error running spellchecker"
msgstr ""
#: nnmon/templates/base.html:26
#: nnmon/templates/base.html:40
msgid "Report cases of Net Neutrality violations"
msgstr ""
#: nnmon/templates/base.html:31
#: nnmon/templates/base.html:45
msgid "Logout"
msgstr ""
#: nnmon/templates/base.html:33
#: nnmon/templates/base.html:47
msgid "Admin"
msgstr ""
#: nnmon/templates/base.html:37
#: nnmon/templates/base.html:51
msgid "Login"
msgstr ""
#: nnmon/templates/base.html:47
#: nnmon/templates/base.html:61
msgid "Toggle navgation"
msgstr ""
#: nnmon/templates/base.html:57
#: nnmon/templates/base.html:71
msgid "Cases"
msgstr ""
#: nnmon/templates/base.html:58
#: nnmon/templates/base.html:72
msgid "What is Net Neutrality?"
msgstr ""
#: nnmon/templates/base.html:59
#: nnmon/templates/base.html:73
msgid "Start Monitoring"
msgstr ""
#: nnmon/templates/base.html:76 nnmon/templates/list.html:83
#: nnmon/templates/base.html:90 nnmon/templates/list.html:84
#: nnmon/templates/search/search.html:104
msgid "Close"
msgstr ""
#: nnmon/templates/base.html:101