fnp
/
prawokultury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ef84b53
)
update speaker timeline
author
Jan Szejko
<janek37@gmail.com>
Wed, 20 Jun 2018 13:11:36 +0000
(15:11 +0200)
committer
Jan Szejko
<janek37@gmail.com>
Wed, 20 Jun 2018 13:11:36 +0000
(15:11 +0200)
prawokultury/locale/pl/LC_MESSAGES/django.mo
patch
|
blob
|
history
prawokultury/locale/pl/LC_MESSAGES/django.po
patch
|
blob
|
history
prawokultury/templates/contact/register-speaker/mail_body.txt
patch
|
blob
|
history
prawokultury/templates/contact/register-speaker/thanks.html
patch
|
blob
|
history
diff --git
a/prawokultury/locale/pl/LC_MESSAGES/django.mo
b/prawokultury/locale/pl/LC_MESSAGES/django.mo
index
b095854
..
a42406b
100644
(file)
Binary files a/prawokultury/locale/pl/LC_MESSAGES/django.mo and b/prawokultury/locale/pl/LC_MESSAGES/django.mo differ
diff --git
a/prawokultury/locale/pl/LC_MESSAGES/django.po
b/prawokultury/locale/pl/LC_MESSAGES/django.po
index
0aded6f
..
a061bb2
100644
(file)
--- a/
prawokultury/locale/pl/LC_MESSAGES/django.po
+++ b/
prawokultury/locale/pl/LC_MESSAGES/django.po
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: prawokultury\n"
"Report-Msgid-Bugs-To: \n"
msgstr ""
"Project-Id-Version: prawokultury\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-
08 11:56
+0200\n"
+"POT-Creation-Date: 2018-06-
20 15:09
+0200\n"
"PO-Revision-Date: 2014-09-30 16:25+0100\n"
"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
"Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
"PO-Revision-Date: 2014-09-30 16:25+0100\n"
"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
"Language-Team: FNP <fundacja@nowoczesnapolska.org.pl>\n"
@@
-23,19
+23,19
@@
msgstr ""
msgid "Registration"
msgstr "Rejestracja"
msgid "Registration"
msgstr "Rejestracja"
-#: contact_forms.py:35 contact_forms.py:30
3
+#: contact_forms.py:35 contact_forms.py:30
4
msgid "First name"
msgstr "Imię"
msgid "First name"
msgstr "Imię"
-#: contact_forms.py:36 contact_forms.py:30
4
+#: contact_forms.py:36 contact_forms.py:30
5
msgid "Last name"
msgstr "Nazwisko"
msgid "Last name"
msgstr "Nazwisko"
-#: contact_forms.py:37 contact_forms.py:28
6 contact_forms.py:305
+#: contact_forms.py:37 contact_forms.py:28
7 contact_forms.py:306
msgid "E-mail"
msgstr "E-mail"
msgid "E-mail"
msgstr "E-mail"
-#: contact_forms.py:38 contact_forms.py:28
7 contact_forms.py:306
+#: contact_forms.py:38 contact_forms.py:28
8 contact_forms.py:307
msgid "Organization"
msgstr "Organizacja"
msgid "Organization"
msgstr "Organizacja"
@@
-44,7
+44,7
@@
msgid "Country of residence"
msgstr ""
#: contact_forms.py:41
msgstr ""
#: contact_forms.py:41
-msgid "I require financial assistance to attend CopyCamp 201
7
."
+msgid "I require financial assistance to attend CopyCamp 201
8
."
msgstr ""
#: contact_forms.py:43
msgstr ""
#: contact_forms.py:43
@@
-266,13
+266,15
@@
msgstr ""
msgid ""
"I want to receive e-mails about future CopyCamps and similar activities of "
"the Modern Poland Foundation"
msgid ""
"I want to receive e-mails about future CopyCamps and similar activities of "
"the Modern Poland Foundation"
-msgstr "Chcę otrzymywać informacje o przyszłych CopyCampach i podobnych działaniach Fundacji Nowoczesna Polska na e-mail"
+msgstr ""
+"Chcę otrzymywać informacje o przyszłych CopyCampach i podobnych działaniach "
+"Fundacji Nowoczesna Polska na e-mail"
-#: contact_forms.py:134 contact_forms.py:37
2
+#: contact_forms.py:134 contact_forms.py:37
3
msgid "Permission for data processing"
msgstr "Zgoda na przetwarzanie danych"
msgid "Permission for data processing"
msgstr "Zgoda na przetwarzanie danych"
-#: contact_forms.py:136 contact_forms.py:37
4
+#: contact_forms.py:136 contact_forms.py:37
5
msgid ""
"I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. "
"Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data "
msgid ""
"I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. "
"Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data "
@@
-282,11
+284,11
@@
msgstr ""
"poczty elektronicznej) przez Fundację Nowoczesna Polska (ul. Marszałkowska "
"84/92, 00-514 Warszawa) w związku z rejestracją na konferencję CopyCamp."
"poczty elektronicznej) przez Fundację Nowoczesna Polska (ul. Marszałkowska "
"84/92, 00-514 Warszawa) w związku z rejestracją na konferencję CopyCamp."
-#: contact_forms.py:141 contact_forms.py:37
8
+#: contact_forms.py:141 contact_forms.py:37
9
msgid "Permission for publication"
msgstr "Zgoda na publikację"
msgid "Permission for publication"
msgstr "Zgoda na publikację"
-#: contact_forms.py:143 contact_forms.py:38
0
+#: contact_forms.py:143 contact_forms.py:38
1
msgid ""
"I agree to having materials, recorded during the conference, released under "
"the terms of <a href=\"http://creativecommons.org/licenses/by-sa/3.0/deed"
msgid ""
"I agree to having materials, recorded during the conference, released under "
"the terms of <a href=\"http://creativecommons.org/licenses/by-sa/3.0/deed"
@@
-296,7
+298,7
@@
msgstr ""
"licencji <a href=\"http://creativecommons.org/licenses/by-sa/3.0/deed.pl"
"\">CC BY-SA</a> oraz rozpowszechnianie wizerunku."
"licencji <a href=\"http://creativecommons.org/licenses/by-sa/3.0/deed.pl"
"\">CC BY-SA</a> oraz rozpowszechnianie wizerunku."
-#: contact_forms.py:157 contact_forms.py:39
1
+#: contact_forms.py:157 contact_forms.py:39
2
#, python-format
msgid "I accept <a href=\"%s\">Terms and Conditions of CopyCamp</a>"
msgstr "Akceptuję <a href=\"%s\">Regulamin CopyCampu</a>"
#, python-format
msgid "I accept <a href=\"%s\">Terms and Conditions of CopyCamp</a>"
msgstr "Akceptuję <a href=\"%s\">Regulamin CopyCampu</a>"
@@
-305,23
+307,23
@@
msgstr "Akceptuję <a href=\"%s\">Regulamin CopyCampu</a>"
msgid "Select at most 3 areas"
msgstr "Wybierz najwyżej 3 obszary"
msgid "Select at most 3 areas"
msgstr "Wybierz najwyżej 3 obszary"
-#: contact_forms.py:17
4
+#: contact_forms.py:17
5
msgid "Travel grant is not provided for the selected country"
msgstr ""
msgid "Travel grant is not provided for the selected country"
msgstr ""
-#: contact_forms.py:17
6
+#: contact_forms.py:17
7
msgid "Please provide this information"
msgstr ""
msgid "Please provide this information"
msgstr ""
-#: contact_forms.py:17
7
+#: contact_forms.py:17
8
msgid "To apply for a travel grant you must provide additional information."
msgstr ""
msgid "To apply for a travel grant you must provide additional information."
msgstr ""
-#: contact_forms.py:19
7
+#: contact_forms.py:19
8
msgid "social security in the creative sector"
msgstr "zabezpieczenie społeczne twórców"
msgid "social security in the creative sector"
msgstr "zabezpieczenie społeczne twórców"
-#: contact_forms.py:19
8
+#: contact_forms.py:19
9
msgid ""
"100 years of the evolution of modern copyright law and industrial property "
"law in Poland and of cultural activities regulated by this law"
msgid ""
"100 years of the evolution of modern copyright law and industrial property "
"law in Poland and of cultural activities regulated by this law"
@@
-329,115
+331,117
@@
msgstr ""
"stulecie ewolucji nowoczesnego prawa autorskiego i prawa własności "
"przemysłowej w Polsce oraz zachowań kulturowych przez to prawo regulowanych"
"stulecie ewolucji nowoczesnego prawa autorskiego i prawa własności "
"przemysłowej w Polsce oraz zachowań kulturowych przez to prawo regulowanych"
-#: contact_forms.py:20
0
+#: contact_forms.py:20
1
msgid "EU copyright reform"
msgstr "reforma prawa autorskiego UE"
msgid "EU copyright reform"
msgstr "reforma prawa autorskiego UE"
-#: contact_forms.py:20
1
+#: contact_forms.py:20
2
msgid "blockchain use prospects"
msgstr "perspektywy wykorzystania technologii blockchain"
msgid "blockchain use prospects"
msgstr "perspektywy wykorzystania technologii blockchain"
-#: contact_forms.py:20
2
+#: contact_forms.py:20
3
msgid "reuse of archives and cultural heritage"
msgid "reuse of archives and cultural heritage"
-msgstr "ponowne wykorzystanie zasobów archiwów i innych instytucji gromadzących dziedzictwo"
+msgstr ""
+"ponowne wykorzystanie zasobów archiwów i innych instytucji gromadzących "
+"dziedzictwo"
-#: contact_forms.py:2
09
+#: contact_forms.py:2
10
msgid "Open call for presentations"
msgstr "Otwarty nabór prezentacji"
msgid "Open call for presentations"
msgstr "Otwarty nabór prezentacji"
-#: contact_forms.py:21
4
+#: contact_forms.py:21
5
msgid "Thematic track"
msgstr "Ścieżka tematyczna"
msgid "Thematic track"
msgstr "Ścieżka tematyczna"
-#: contact_forms.py:21
8
+#: contact_forms.py:21
9
msgid "Short biographical note in Polish (max. 500 characters, not required)"
msgstr "Krótka notka biograficzna po polsku (max. 500 znaków)"
msgid "Short biographical note in Polish (max. 500 characters, not required)"
msgstr "Krótka notka biograficzna po polsku (max. 500 znaków)"
-#: contact_forms.py:22
0
+#: contact_forms.py:22
1
msgid "Short biographical note in English (max. 500 characters)"
msgstr "Krótka notka biograficzna po angielsku (max. 500 znaków)"
msgid "Short biographical note in English (max. 500 characters)"
msgstr "Krótka notka biograficzna po angielsku (max. 500 znaków)"
-#: contact_forms.py:22
2
+#: contact_forms.py:22
3
msgid "Photo"
msgstr "Zdjęcie"
msgid "Photo"
msgstr "Zdjęcie"
-#: contact_forms.py:22
3
+#: contact_forms.py:22
4
msgid "Phone number"
msgstr "Numer telefonu"
msgid "Phone number"
msgstr "Numer telefonu"
-#: contact_forms.py:22
5
+#: contact_forms.py:22
6
msgid "(used only for organizational purposes)"
msgstr "(używany wyłącznie do celów organizacyjnych)"
msgid "(used only for organizational purposes)"
msgstr "(używany wyłącznie do celów organizacyjnych)"
-#: contact_forms.py:22
8
+#: contact_forms.py:22
9
msgid "Presentation title in Polish (not required)"
msgstr "Polski tytuł prezentacji"
msgid "Presentation title in Polish (not required)"
msgstr "Polski tytuł prezentacji"
-#: contact_forms.py:23
1
+#: contact_forms.py:23
2
msgid "Presentation title in English"
msgstr "Angielski tytuł prezentacji"
msgid "Presentation title in English"
msgstr "Angielski tytuł prezentacji"
-#: contact_forms.py:23
2
+#: contact_forms.py:23
3
msgid "Presentation summary (max. 1800 characters)"
msgstr "Streszczenie (maks. 1800 znaków)"
msgid "Presentation summary (max. 1800 characters)"
msgstr "Streszczenie (maks. 1800 znaków)"
-#: contact_forms.py:24
4
+#: contact_forms.py:24
5
msgid ""
"I accept <a href=\"/en/info/terms-and-conditions/\">CopyCamp Terms and "
"Conditions</a>."
msgstr "Akceptuję <a href=\"/info/regulamin/\">regulamin CopyCampu</a>"
msgid ""
"I accept <a href=\"/en/info/terms-and-conditions/\">CopyCamp Terms and "
"Conditions</a>."
msgstr "Akceptuję <a href=\"/info/regulamin/\">regulamin CopyCampu</a>"
-#: contact_forms.py:28
3
+#: contact_forms.py:28
4
msgid "Next CopyCamp"
msgstr "Kolejny CopyCamp"
msgid "Next CopyCamp"
msgstr "Kolejny CopyCamp"
-#: contact_forms.py:28
5
+#: contact_forms.py:28
6
msgid "Name"
msgstr "Imię i nazwisko"
msgid "Name"
msgstr "Imię i nazwisko"
-#: contact_forms.py:
299
+#: contact_forms.py:
300
msgid "Workshop"
msgstr "Warsztat"
msgid "Workshop"
msgstr "Warsztat"
-#: contact_forms.py:30
7
+#: contact_forms.py:30
8
msgid "Country"
msgstr "Kraj"
msgid "Country"
msgstr "Kraj"
-#: contact_forms.py:31
0
+#: contact_forms.py:31
1
msgid "<h3>I'll take a part in workshops</h3>"
msgstr "<h3>Wezmę udział w warsztatach</h3>"
msgid "<h3>I'll take a part in workshops</h3>"
msgstr "<h3>Wezmę udział w warsztatach</h3>"
-#: contact_forms.py:31
1
+#: contact_forms.py:31
2
msgid "Only workshops with any spots left are visible here."
msgstr "Widoczne są tylko warsztaty, w których są jeszcze miejsca."
msgid "Only workshops with any spots left are visible here."
msgstr "Widoczne są tylko warsztaty, w których są jeszcze miejsca."
-#: contact_forms.py:31
3
+#: contact_forms.py:31
4
msgid "<strong>Thursday, September 28th, 10 a.m.–12 noon</strong>"
msgstr ""
msgid "<strong>Thursday, September 28th, 10 a.m.–12 noon</strong>"
msgstr ""
-#: contact_forms.py:32
0
+#: contact_forms.py:32
1
msgid "<strong>Thursday, September 28th, 12 noon–2 p.m.</strong>"
msgstr ""
msgid "<strong>Thursday, September 28th, 12 noon–2 p.m.</strong>"
msgstr ""
-#: contact_forms.py:32
4
+#: contact_forms.py:32
5
msgid "<strong>Friday, September 29th, 9 a.m.–11 noon</strong>"
msgstr ""
msgid "<strong>Friday, September 29th, 9 a.m.–11 noon</strong>"
msgstr ""
-#: contact_forms.py:3
29
+#: contact_forms.py:3
30
msgid ""
"Please describe the most important recent changes to copyright user rights "
"in your national law. (max 1500 characters)"
msgstr ""
msgid ""
"Please describe the most important recent changes to copyright user rights "
"in your national law. (max 1500 characters)"
msgstr ""
-#: contact_forms.py:33
3
+#: contact_forms.py:33
4
msgid "<strong>Friday, September 29th, 10 a.m.–12 noon</strong>"
msgstr ""
msgid "<strong>Friday, September 29th, 10 a.m.–12 noon</strong>"
msgstr ""
-#: contact_forms.py:33
8
+#: contact_forms.py:33
9
msgid "<strong>Friday, September 29th, 12 noon–2 p.m.</strong>"
msgstr ""
msgid "<strong>Friday, September 29th, 12 noon–2 p.m.</strong>"
msgstr ""
-#: contact_forms.py:3
69
+#: contact_forms.py:3
70
msgid ""
"I am interested in receiving information about the Modern Poland "
"Foundation's activities by e-mail"
msgid ""
"I am interested in receiving information about the Modern Poland "
"Foundation's activities by e-mail"
@@
-445,11
+449,11
@@
msgstr ""
"Jestem zainteresowana/y otrzymywaniem drogą mailową informacji dotyczących "
"działalności Fundacji Nowoczesna Polska"
"Jestem zainteresowana/y otrzymywaniem drogą mailową informacji dotyczących "
"działalności Fundacji Nowoczesna Polska"
-#: contact_forms.py:41
8
+#: contact_forms.py:41
9
msgid "You can't choose more than one workshop during the same period"
msgstr "Nie możesz wybrać warsztatów odbywających się w tym samym czasie"
msgid "You can't choose more than one workshop during the same period"
msgstr "Nie możesz wybrać warsztatów odbywających się w tym samym czasie"
-#: contact_forms.py:42
0
+#: contact_forms.py:42
1
msgid "Please choose at least one workshop."
msgstr "Proszę wybrać co najmniej jeden warsztat."
msgid "Please choose at least one workshop."
msgstr "Proszę wybrać co najmniej jeden warsztat."
@@
-529,13
+533,13
@@
msgid "Thank you for submitting your proposal."
msgstr "Dziękujemy za zgłoszenie."
#: templates/contact/register-speaker/mail_body.txt:3
msgstr "Dziękujemy za zgłoszenie."
#: templates/contact/register-speaker/mail_body.txt:3
-msgid "Your submission can be modified until Ju
ne 11th
at:"
-msgstr "Zgłoszenie można modyfikować do
11 czerw
ca pod adresem:"
+msgid "Your submission can be modified until Ju
ly 31st
at:"
+msgstr "Zgłoszenie można modyfikować do
31 lip
ca pod adresem:"
#: templates/contact/register-speaker/mail_body.txt:6
#: templates/contact/register-speaker/thanks.html:10
#: templates/contact/register-speaker/mail_body.txt:6
#: templates/contact/register-speaker/thanks.html:10
-msgid "We will inform you of the open call results
by the end of June
."
-msgstr "O wynikach naboru poinformujemy
najpóźniej do końca czerwc
a."
+msgid "We will inform you of the open call results
in mid-August
."
+msgstr "O wynikach naboru poinformujemy
w połowie sierpni
a."
#: templates/contact/register-speaker/mail_subject.txt:1
msgid "Thank you for submitting your proposal"
#: templates/contact/register-speaker/mail_subject.txt:1
msgid "Thank you for submitting your proposal"
@@
-543,10
+547,10
@@
msgstr "Dziękujemy za zgłoszenie."
#: templates/contact/register-speaker/thanks.html:8
msgid ""
#: templates/contact/register-speaker/thanks.html:8
msgid ""
-"Your submission can be modified until Ju
ne 11th
using the unique link sent "
+"Your submission can be modified until Ju
ly 31st
using the unique link sent "
"to you by e-mail."
msgstr ""
"to you by e-mail."
msgstr ""
-"Zgłoszenie można modyfikować do
11 czerw
ca używając unikalnego adresu "
+"Zgłoszenie można modyfikować do
31 lip
ca używając unikalnego adresu "
"przesłanego e-mailem."
#: templates/contact/remind-me/thanks.html:6
"przesłanego e-mailem."
#: templates/contact/remind-me/thanks.html:6
diff --git
a/prawokultury/templates/contact/register-speaker/mail_body.txt
b/prawokultury/templates/contact/register-speaker/mail_body.txt
index
3b37ee4
..
d28fdbf
100644
(file)
--- a/
prawokultury/templates/contact/register-speaker/mail_body.txt
+++ b/
prawokultury/templates/contact/register-speaker/mail_body.txt
@@
-1,6
+1,6
@@
{% load i18n %}{% trans "Thank you for submitting your proposal." %}
{% load i18n %}{% trans "Thank you for submitting your proposal." %}
-{% trans "Your submission can be modified until Ju
ne 11th
at:" %}
+{% trans "Your submission can be modified until Ju
ly 31st
at:" %}
https://copycamp.pl{% url 'contact_form_key' form.form_tag contact.key %}
https://copycamp.pl{% url 'contact_form_key' form.form_tag contact.key %}
-{% trans "We will inform you of the open call results
by the end of June
." %}
+{% trans "We will inform you of the open call results
in mid-August
." %}
diff --git
a/prawokultury/templates/contact/register-speaker/thanks.html
b/prawokultury/templates/contact/register-speaker/thanks.html
index
040bf73
..
e77b187
100644
(file)
--- a/
prawokultury/templates/contact/register-speaker/thanks.html
+++ b/
prawokultury/templates/contact/register-speaker/thanks.html
@@
-5,9
+5,9
@@
<p class="notice">{% trans "Thank you for submitting your proposal." %}</p>
<p class="notice">{% trans "Thank you for submitting your proposal." %}</p>
-<p class="notice">{% trans "Your submission can be modified until Ju
ne 11th
using the unique link sent to you by e-mail." %}</p>
+<p class="notice">{% trans "Your submission can be modified until Ju
ly 31st
using the unique link sent to you by e-mail." %}</p>
-<p class="notice">{% trans "We will inform you of the open call results
by the end of June
." %}</p>
+<p class="notice">{% trans "We will inform you of the open call results
in mid-August
." %}</p>
{% endblock %}
{% endblock %}