Commit e5801ef6 authored by Okhin's avatar Okhin
Browse files

Finishing the registering process, and updating the messages

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