diff --git a/extra_translations.py b/extra_translations.py new file mode 100644 index 0000000..a5bab1c --- /dev/null +++ b/extra_translations.py @@ -0,0 +1,10 @@ +""" +This file contains strings that do not have translations in libraries, +but we still need them to be translated. + +This is easier method than finding some hard way to add translations +for specifig files or modules from libaries to project locales files. +""" +from django.utils.translation import ugettext_lazy as _ + +_('This field is required.') diff --git a/feedback/locale/fi/LC_MESSAGES/django.po b/feedback/locale/fi/LC_MESSAGES/django.po index 105c20b..a700b03 100644 --- a/feedback/locale/fi/LC_MESSAGES/django.po +++ b/feedback/locale/fi/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-04 18:20+0300\n" -"PO-Revision-Date: 2016-10-04 18:28+0200\n" +"POT-Creation-Date: 2016-11-24 19:32+0200\n" +"PO-Revision-Date: 2016-11-23 20:19+0200\n" "Last-Translator: Jaakko Kantojärvi \n" "Language-Team: English <>\n" "Language: en_US\n" @@ -17,11 +17,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" -#: feedback/filters.py:149 +#: feedback/filters.py:150 msgid "Oldest first" msgstr "Vanhemmat ensin" -#: feedback/filters.py:150 +#: feedback/filters.py:151 msgid "Newest first" msgstr "Uudemmat ensin" @@ -50,7 +50,6 @@ msgid "Read" msgstr "Luettu" #: feedback/models.py:93 -#| msgid "Graded" msgid "Ungraded" msgstr "Ei arvosteltu" @@ -67,73 +66,82 @@ msgid "Manually graded" msgstr "Käsin arvosteltu" #: feedback/models.py:97 +msgid "Unresponded" +msgstr "Vastaamaton" + +#: feedback/models.py:98 msgid "Responded" msgstr "Vastattu" -#: feedback/models.py:98 +#: feedback/models.py:99 msgid "Upload ok" msgstr "Lähetys on onnistunut" -#: feedback/models.py:99 +#: feedback/models.py:100 msgid "Upload has error" msgstr "Lähetys on epäonnistunut" -#: feedback/models.py:176 +#: feedback/models.py:178 msgid "No response" msgstr "Ei vastausta" -#: feedback/models.py:177 +#: feedback/models.py:179 msgid "Rejected" msgstr "Hylätty" -#: feedback/models.py:178 +#: feedback/models.py:180 msgid "Accepted" msgstr "Hyväksytty" -#: feedback/models.py:179 +#: feedback/models.py:181 msgid "Good" msgstr "Hyvä" -#: feedback/templates/feedback/_form.html:14 +#: feedback/templates/feedback/_form.html:11 +msgid "Staff response" +msgstr "Henkilökunnan vastaus" + +#: feedback/templates/feedback/_form.html:26 +msgid "This feedback has unsaved changes!" +msgstr "Palautteessa on tallentamattomia muutoksia!" + +#: feedback/templates/feedback/_form.html:33 msgid "Submit" msgstr "Lähetä" -#: feedback/templates/feedback/_form.html:14 +#: feedback/templates/feedback/_form.html:33 msgid "Submit update" msgstr "Lähetä uudestaan" -#: feedback/templates/feedback/_form.html:23 -msgid "Staff response" -msgstr "Henkilökunnan vastaus" +#: feedback/templates/feedback/_form.html:37 +msgid "Reset changes" +msgstr "Peru muutokset" -#: feedback/templates/feedback/_form.html:27 +#: feedback/templates/feedback/new.html:20 #, python-format -msgid "" -"\n" -"\t\t\tFeedback is %(status)s\n" -"\t\t" -msgstr "" -"\n" -"\t\t\tPalaute on %(status)s\n" -"\t\t" +msgid "Feedback %(jutut)s for %(aplus)s" +msgstr "Palaute %(jutut)s palvelulle %(aplus)s" #: feedback/templates/feedback_tags/_tag_form.html:8 -#| msgid "Older feedbacks" msgid "Add new feedback tag" msgstr "Lisää uusi palaute tägi" #: feedback/templates/feedback_tags/_tag_form.html:10 #: feedback/templates/feedback_tags/tag_edit.html:5 -#| msgid "Filter feedbacks" msgid "Edit feedback tag" msgstr "Muokkaa palaute tägiä" -#: feedback/templates/feedback_tags/_tag_form.html:20 +#: feedback/templates/feedback_tags/_tag_form.html:21 +msgid "Add" +msgstr "Lisää" + +#: feedback/templates/feedback_tags/_tag_form.html:23 msgid "Save" msgstr "Tallenna" -#: feedback/templates/feedback_tags/_tag_form.html:22 +#: feedback/templates/feedback_tags/_tag_form.html:24 #: feedback/templates/feedback_tags/tag_confirm_delete.html:19 +#: feedback/templates/manage/_response_panel.html:43 msgid "Cancel" msgstr "Takaisin" @@ -154,7 +162,8 @@ msgstr "" "\n" "\t\t\t\t\tOletko varma, että haluat poistaa palaute tägin %(tag)s kurssilta " "%(course)s?\n" -"\t\t\t\t\tTämä tägi poistetaan kaikista palautteista, joihin se oli tägätty.\n" +"\t\t\t\t\tTämä tägi poistetaan kaikista palautteista, joihin se oli " +"tägätty.\n" "\t\t\t\t\t" #: feedback/templates/feedback_tags/tag_confirm_delete.html:18 @@ -162,7 +171,6 @@ msgid "Confirm" msgstr "Vahvista" #: feedback/templates/feedback_tags/tag_list.html:6 -#| msgid "Filter feedbacks" msgid "List of feedback tags" msgstr "Luettelo palautetägeistä" @@ -226,24 +234,28 @@ msgstr "Rajausvalinnat" msgid "Conflict" msgstr "Ristiriita" -#: feedback/templates/manage/_response_panel.html:37 +#: feedback/templates/manage/_response_panel.html:27 +msgid "not saved" +msgstr "tallentamaton" + +#: feedback/templates/manage/_response_panel.html:38 msgid "Reset" msgstr "Peru" -#: feedback/templates/manage/_response_panel.html:41 +#: feedback/templates/manage/_response_panel.html:50 #, python-format msgid "%(time)s by %(user)s" msgstr "%(time)s, %(user)s" -#: feedback/templates/manage/_response_panel.html:48 +#: feedback/templates/manage/_response_panel.html:57 msgid "This feedback was automatically accepted" msgstr "Palaute on automaattisesti hyväksytty" -#: feedback/templates/manage/_response_panel.html:49 +#: feedback/templates/manage/_response_panel.html:58 msgid "auto" msgstr "auto" -#: feedback/templates/manage/_response_panel.html:64 +#: feedback/templates/manage/_response_panel.html:72 #, python-format msgid "" "Upload is not ok.
Tried %(count)s times.
Last tried %(when)s " @@ -252,51 +264,46 @@ msgstr "" "Lähetyksessä on virhe.
Lähettämistä yritetty %(count)s kertaa." "
Viimeisin yritys %(when)s sai vastauskoodin %(code)s." -#: feedback/templates/manage/_response_panel.html:65 +#: feedback/templates/manage/_response_panel.html:74 #, python-format msgid "upload status %(code)s" msgstr "lähetys tila %(code)s" -#: feedback/templates/manage/_response_panel.html:145 -msgid "Edit" -msgstr "Muokkaa" - -#: feedback/templates/manage/base.html:50 +#: feedback/templates/manage/base.html:53 #, python-format msgid "Site: %(name)s" msgstr "Sivusto: %(name)s" -#: feedback/templates/manage/base.html:52 +#: feedback/templates/manage/base.html:55 msgid "Select site" msgstr "Valitse sivusto" -#: feedback/templates/manage/base.html:72 +#: feedback/templates/manage/base.html:75 msgid "Select course" msgstr "Valitse kurssi" -#: feedback/templates/manage/base.html:119 +#: feedback/templates/manage/base.html:122 msgid "More" msgstr "Lisää" -#: feedback/templates/manage/base.html:121 +#: feedback/templates/manage/base.html:126 #: feedback/templates/manage/feedback_unread.html:12 msgid "Filter feedbacks" msgstr "Rajaa palautteita" -#: feedback/templates/manage/base.html:122 -#| msgid "Older feedbacks" +#: feedback/templates/manage/base.html:130 msgid "Manage feedback tags" msgstr "Hallitse palautetägejä" -#: feedback/templates/manage/base.html:123 +#: feedback/templates/manage/base.html:134 msgid "Student list" msgstr "Opiskelijalista" -#: feedback/templates/manage/base.html:125 +#: feedback/templates/manage/base.html:139 msgid "Clear cache" msgstr "Tyhjennä välimuisti" -#: feedback/templates/manage/base.html:146 +#: feedback/templates/manage/base.html:161 msgid "Language" msgstr "Kieli" @@ -324,12 +331,3 @@ msgstr "Lukemattomat palautteet" #: feedback/templates/manage/feedback_unread.html:31 msgid "No unread feedback." msgstr "Ei lukemattomia palautteita" - -#~ msgid "Has response message" -#~ msgstr "Omaa vastausviestin" - -#~ msgid "User list" -#~ msgstr "Käyttäjälista" - -#~ msgid "Accepted and Good" -#~ msgstr "Hyväksytty lisäpisteellä" diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index b6708f8..5234f06 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-23 05:54+0300\n" -"PO-Revision-Date: 2016-09-19 12:35+0200\n" +"POT-Creation-Date: 2016-11-24 19:32+0200\n" +"PO-Revision-Date: 2016-11-22 17:04+0200\n" "Last-Translator: Jaakko Kantojärvi \n" "Language-Team: English <>\n" "Language: en_US\n" @@ -17,6 +17,10 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" +#: extra_translations.py:10 +msgid "This field is required." +msgstr "Tämä kenttä on pakollinen." + #: templates/_pagination.html:11 templates/_pagination.html:13 msgid "Previous" msgstr "Edellinen" @@ -36,5 +40,6 @@ msgstr "" msgid "Next" msgstr "Seuraava" -#~ msgid "API token" -#~ msgstr "API avain" +#: templates/bootstrapform/field.html:35 templates/bootstrapform/field.html:62 +msgid "(*) Required" +msgstr "(*) Pakollinen"