diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index b661036..3d5c60e 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 76f0867..cdb456d 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-31 21:09+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"POT-Creation-Date: 2017-11-02 21:59+0100\n" +"PO-Revision-Date: 2017-11-02 23:09+0200\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Last-Translator: \n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.4\n" #: .\infoscreen\models.py:97 msgid "ABB jobs" @@ -177,11 +177,11 @@ msgstr "Member" #: .\members\forms.py:123 msgid "I'm a member of AYY" -msgstr "" +msgstr "I'm a member of AYY" #: .\members\forms.py:124 msgid "I want to receive a weekly newsletter" -msgstr "" +msgstr "I want to receive a weekly newsletter" #: .\members\models.py:14 msgid "First name" @@ -235,7 +235,6 @@ msgstr "Created" #: .\members\models.py:104 .\members\templates\member_add_many_confirm.html:12 #: .\members\templates\members_base.html:52 -#: .\webapp\templates\main_index.html:7 msgid "Members" msgstr "Members" @@ -248,10 +247,8 @@ msgid "Edit" msgstr "Edit" #: .\members\templates\application_delete_confirm.html:9 -#, fuzzy -#| msgid "Are you sure you want to delete this payment?" msgid "Are you sure you want to delete this application?" -msgstr "Are you sure you want to delete this payment?" +msgstr "Are you sure you want to delete this application?" #: .\members\templates\application_delete_confirm.html:19 #: .\members\templates\member_delete_confirm.html:19 @@ -286,6 +283,7 @@ msgstr "Don't forget to pay your membership fee!" #: .\members\templates\application_index.html:16 #: .\members\templates\member_add_many.html:55 #: .\members\templates\member_add_many_confirm.html:22 +#: .\templates\password_reset\recovery_form.html:10 #: .\webapp\templates\kaehmy_list.html:48 msgid "Send" msgstr "Send" @@ -294,6 +292,12 @@ msgstr "Send" msgid "Member applications" msgstr "Member applications" +#: .\members\templates\application_list.html:20 +#: .\members\templates\member_list.html:44 +#: .\members\templates\payment_list.html:41 +msgid "Download Excel" +msgstr "Download Excel" + #: .\members\templates\application_success.html:8 msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty." msgstr "Amazing! Your membership application has been sent." @@ -316,7 +320,7 @@ msgstr "Save" #: .\members\templates\member_add_many.html:8 msgid "Add many members" -msgstr "" +msgstr "Add many members" #: .\members\templates\member_add_many.html:13 msgid "" @@ -327,52 +331,64 @@ msgid "" "event will be created for that member instead.\n" " " msgstr "" +"\n" +" Enter member information in CSV format, separate members on " +"separate lines. \n" +" If a new member already exists in the database, a new payment " +"event will be created for that member instead.\n" +" " #: .\members\templates\member_add_many.html:21 msgid "Format the member table like this:" -msgstr "" +msgstr "Format the member table like this:" #: .\members\templates\member_add_many.html:25 msgid "" "Columns: First name, last name, email address, place of origin, AYY member, " "JAS recipient" msgstr "" +"Columns: First name, last name, email address, place of origin, AYY member, " +"JAS recipient" #: .\members\templates\member_add_many.html:28 msgid "Save the file as CSV" -msgstr "" +msgstr "Save the file as CSV" #: .\members\templates\member_add_many.html:33 msgid "Upload file" -msgstr "" +msgstr "Upload file" #: .\members\templates\member_add_many.html:37 msgid "Payment source" -msgstr "" +msgstr "Payment source" #: .\members\templates\member_add_many.html:41 msgid "Cash payment" -msgstr "" +msgstr "Cash payment" #: .\members\templates\member_add_many.html:44 msgid "" "This payment source will be used to create any payments for new members that " "already exist in the database." msgstr "" +"This payment source will be used to create any payments for new members that " +"already exist in the database." #: .\members\templates\member_add_many.html:48 msgid "CSV delimiter" -msgstr "" +msgstr "CSV delimiter" #: .\members\templates\member_add_many.html:51 msgid "" "The symbol that is used to separate items in one line. Defaults to " "';' (semicolon)." msgstr "" +"The symbol that is used to separate items in one line. Defaults to " +"';' (semicolon)." #: .\members\templates\member_add_many_confirm.html:8 msgid "Confirm adding these entries?" -msgstr "" +msgstr "Confirm adding these entries?" #: .\members\templates\member_add_many_confirm.html:16 #: .\members\templates\members_base.html:60 @@ -394,21 +410,17 @@ msgstr "Member register" #: .\members\templates\member_list.html:21 msgid "Members in register:" -msgstr "" +msgstr "Members in register:" #: .\members\templates\member_list.html:28 #: .\members\templates\payment_list.html:25 msgid "Search" -msgstr "" +msgstr "Search" #: .\members\templates\member_list.html:36 #: .\members\templates\payment_list.html:33 msgid "Showing results for" -msgstr "" - -#: .\members\templates\member_list.html:44 -msgid "Download CSV" -msgstr "Download CSV" +msgstr "Showing results for" #: .\members\templates\members_base.html:33 #: .\members\templates\members_base.html:42 @@ -462,10 +474,8 @@ msgid "Payment events" msgstr "Payment events" #: .\members\templates\payment_list.html:18 -#, fuzzy -#| msgid "Member register" msgid "Payments in register:" -msgstr "Member register" +msgstr "Payments in register:" #: .\members\templates\settings.html:17 msgid "Language" @@ -483,92 +493,98 @@ msgstr "English" msgid "Submit" msgstr "Submit" -#: .\members\views\applications.py:51 .\members\views\applications.py:119 -#: .\members\views\applications.py:148 +#: .\members\views\applications.py:51 .\members\views\applications.py:112 +#: .\members\views\applications.py:137 msgid "No application id specified" msgstr "No application id specified" -#: .\members\views\applications.py:73 +#: .\members\views\applications.py:71 msgid "Application missing 'id' field." -msgstr "" +msgstr "Application missing 'id' field." -#: .\members\views\applications.py:83 +#: .\members\views\applications.py:80 msgid "Email {} is already in use by a member. Application cannot be accepted." msgstr "" +"Email {} is already in use by a member. Application cannot be accepted." -#: .\members\views\applications.py:93 +#: .\members\views\applications.py:91 msgid "Successfully accepted application" msgstr "Successfully accepted application" -#: .\members\views\applications.py:123 +#: .\members\views\applications.py:116 msgid "Successfully deleted application" msgstr "Successfully deleted application" -#: .\members\views\applications.py:135 +#: .\members\views\applications.py:126 msgid "Could not delete application object" msgstr "Could not delete application object" -#: .\members\views\members.py:74 .\members\views\members.py:179 -#: .\members\views\members.py:206 +#: .\members\views\members.py:73 .\members\views\members.py:175 +#: .\members\views\members.py:199 msgid "No member id specified" msgstr "No member id specified" -#: .\members\views\members.py:111 +#: .\members\views\members.py:114 msgid "Failed to import members" msgstr "Failed to import members" -#: .\members\views\members.py:125 +#: .\members\views\members.py:128 msgid "Successfully added member" msgstr "Successfully added member" -#: .\members\views\members.py:148 +#: .\members\views\members.py:149 msgid "Member missing 'id' field." -msgstr "" +msgstr "Member missing 'id' field." #: .\members\views\members.py:158 msgid "Successfully updated member" msgstr "Successfully updated member" -#: .\members\views\members.py:183 +#: .\members\views\members.py:179 msgid "Successfully deleted member" msgstr "Successfully deleted member" -#: .\members\views\members.py:194 +#: .\members\views\members.py:188 msgid "Could not delete member object" msgstr "Could not delete member object" -#: .\members\views\payments.py:70 +#: .\members\views\payments.py:71 msgid "Successfully added payment for member" msgstr "Successfully added payment for member" -#: .\members\views\payments.py:89 .\members\views\payments.py:108 -#: .\members\views\payments.py:128 +#: .\members\views\payments.py:88 .\members\views\payments.py:105 +#: .\members\views\payments.py:123 msgid "No payment id specified" msgstr "No payment id specified" -#: .\members\views\payments.py:133 +#: .\members\views\payments.py:128 msgid "Successfully deleted payment" msgstr "Successfully deleted payment" -#: .\members\views\payments.py:143 +#: .\members\views\payments.py:136 msgid "Could not delete payment object" msgstr "Could not delete payment object" -#: .\members\views\payments.py:163 +#: .\members\views\payments.py:156 msgid "Successfully updated payment" msgstr "Successfully updated payment" -#: .\members\views\payments.py:170 +#: .\members\views\payments.py:161 msgid "Could not update payment object" msgstr "Could not update payment object" -#: .\members\views\utils.py:121 +#: .\members\views\utils.py:119 msgid "Missing CSV file" -msgstr "" +msgstr "Missing CSV file" #: .\templates\admin\base_site.html:43 msgid "Go" -msgstr "" +msgstr "Go" + +#: .\templates\base.html:14 .\webapp\templates\kaehmy_base.html:14 +#: .\webapp\templates\main_index.html:9 +msgid "Aalto-yliopiston Sähköinsinöörikilta ry" +msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" #: .\templates\error.html:8 .\webapp\templates\kaehmy_error.html:8 msgid "Error" @@ -578,53 +594,117 @@ msgstr "Error" msgid "Back" msgstr "Back" -#: .\templates\footer.html:23 .\webapp\templates\kaehmy_footer.html:23 +#: .\templates\footer.html:10 .\templates\footer.html:60 +#: .\webapp\templates\kaehmy_footer.html:23 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" +#: .\templates\login.html:12 .\templates\login.html:13 +msgid "Username" +msgstr "Username" + +#: .\templates\login.html:16 .\templates\login.html:17 +msgid "Password" +msgstr "Password" + +#: .\templates\login.html:20 +msgid "Forgot password?" +msgstr "Forgot password?" + +#: .\templates\login.html:26 +msgid "Log in" +msgstr "Log in" + +#: .\templates\password_reset\recovery_done.html:3 +msgid "New password set" +msgstr "New password set" + +#: .\templates\password_reset\recovery_done.html:6 +msgid "" +"Your password has successfully been reset. You can use it right now on the " +"login page." +msgstr "" +"Your password has successfully been reset. You can use it right now on the " +"login page." + +#: .\templates\password_reset\recovery_form.html:4 +msgid "Password recovery" +msgstr "Password recovery" + +#: .\templates\password_reset\reset.html:5 +#, python-format +msgid "" +"Sorry, this password reset link is invalid. You can still request a new one." +msgstr "" +"Sorry, this password reset link is invalid. You can still request a new one." + +#: .\templates\password_reset\reset.html:7 +#, python-format +msgid "Hi, %(username)s. Please choose your new password." +msgstr "Hi, %(username)s. Please choose your new password." + +#: .\templates\password_reset\reset.html:11 +msgid "Set new password" +msgstr "Set new password" + +#: .\templates\password_reset\reset_sent.html:4 +msgid "Password recovery sent" +msgstr "Password recovery sent" + +#: .\templates\password_reset\reset_sent.html:7 +#, python-format +msgid "" +"An email was sent to %(email)s %(ago)s ago. Use the link in " +"it to set a new password." +msgstr "" +"An email was sent to %(email)s %(ago)s ago. Use the link in " +"it to set a new password." + #: .\webapp\forms.py:38 msgid "Email (not public)" -msgstr "" +msgstr "Email (not public)" #: .\webapp\forms.py:39 msgid "Phone number (not public)" -msgstr "" +msgstr "Phone number (not public)" #: .\webapp\forms.py:44 msgid "Custom roles" -msgstr "" +msgstr "Custom roles" #: .\webapp\forms.py:52 .\webapp\templates\kaehmy.html:41 msgid "Preset roles" -msgstr "" +msgstr "Preset roles" #: .\webapp\forms.py:76 msgid "Invalid phone number" -msgstr "" +msgstr "Invalid phone number" #: .\webapp\forms.py:84 msgid "Custom role with the same name already exists." -msgstr "" +msgstr "Custom role with the same name already exists." #: .\webapp\models.py:17 msgid "Webapp" -msgstr "" +msgstr "Webapp" #: .\webapp\models.py:28 msgid "Tag" -msgstr "" +msgstr "Tag" #: .\webapp\models.py:29 msgid "Tags" -msgstr "" +msgstr "Tags" #: .\webapp\models.py:32 msgid "Tag: {}" -msgstr "" +msgstr "Tag: {}" #: .\webapp\models.py:52 msgid "Feed: {}" -msgstr "" +msgstr "Feed: {}" #: .\webapp\models.py:55 msgid "Feed" @@ -658,13 +738,13 @@ msgstr "" msgid "Corporate affairs" msgstr "" -#: .\webapp\models.py:95 .\webapp\templates\freshmen.html:7 -#: .\webapp\templates\navigation.html:10 +#: .\webapp\models.py:95 .\webapp\templates\freshmen.html:10 +#: .\webapp\templates\navigation.html:9 msgid "Freshmen" msgstr "Freshmen" -#: .\webapp\models.py:96 .\webapp\templates\international.html:7 -#: .\webapp\templates\navigation.html:16 +#: .\webapp\models.py:96 .\webapp\templates\international.html:10 +#: .\webapp\templates\navigation.html:15 msgid "International" msgstr "International" @@ -701,66 +781,48 @@ msgid "Studies" msgstr "" #: .\webapp\models.py:105 -#, fuzzy -#| msgid "Sössö articles" msgid "Sössö magazine" -msgstr "Sössö articles" +msgstr "Sössö magazine" #: .\webapp\models.py:106 -#, fuzzy -#| msgid "Applications" msgid "Alumni relations" -msgstr "Applications" +msgstr "Alumni relations" #: .\webapp\models.py:107 msgid "Others" msgstr "" #: .\webapp\models.py:111 .\webapp\models.py:191 -#, fuzzy -#| msgid "Add member" msgid "Board member" -msgstr "Add member" +msgstr "Board member" #: .\webapp\models.py:112 msgid "Category" msgstr "" #: .\webapp\models.py:116 -#, fuzzy -#| msgid "Add member" msgid "board member" -msgstr "Add member" +msgstr "board member" #: .\webapp\models.py:122 -#, fuzzy -#| msgid "Duration" msgid "Description" -msgstr "Duration" +msgstr "Description" #: .\webapp\models.py:129 -#, fuzzy -#| msgid "Total challenges:" msgid "Preset kaehmy role" -msgstr "Total challenges:" +msgstr "Preset kaehmy role" #: .\webapp\models.py:130 -#, fuzzy -#| msgid "Total challenges:" msgid "Preset kaehmy roles" -msgstr "Total challenges:" +msgstr "Preset kaehmy roles" #: .\webapp\models.py:137 -#, fuzzy -#| msgid "Total challenges:" msgid "Custom kaehmy role" -msgstr "Total challenges:" +msgstr "Custom kaehmy role" #: .\webapp\models.py:138 -#, fuzzy -#| msgid "Total challenges:" msgid "Custom kaehmy roles" -msgstr "Total challenges:" +msgstr "Custom kaehmy roles" #: .\webapp\models.py:145 msgid "Timestamp" @@ -803,10 +865,8 @@ msgid "Custom role name" msgstr "" #: .\webapp\models.py:199 -#, fuzzy -#| msgid "Member applications" msgid "Kaehmy application: {}" -msgstr "Member applications" +msgstr "Kaehmy application: {}" #: .\webapp\models.py:221 msgid "Board: {}" @@ -852,24 +912,20 @@ msgstr "" msgid "SIK Admin" msgstr "SIK Admin" -#: .\webapp\templates\base.html:15 .\webapp\templates\kaehmy_base.html:14 -msgid "Aalto-yliopiston Sähköinsinöörikilta ry" -msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" - -#: .\webapp\templates\contact.html:7 .\webapp\templates\navigation.html:22 +#: .\webapp\templates\contact.html:10 .\webapp\templates\navigation.html:21 msgid "Contact" msgstr "Contact" -#: .\webapp\templates\event_calendar.html:7 -#: .\webapp\templates\navigation.html:13 +#: .\webapp\templates\event_calendar.html:10 +#: .\webapp\templates\navigation.html:12 msgid "Event calendar" msgstr "Event calendar" -#: .\webapp\templates\guild.html:7 +#: .\webapp\templates\guild.html:10 msgid "Kilta" msgstr "Guild" -#: .\webapp\templates\jobs.html:7 .\webapp\templates\navigation.html:29 +#: .\webapp\templates\jobs.html:10 .\webapp\templates\navigation.html:28 msgid "Jobs" msgstr "Jobs" @@ -931,22 +987,16 @@ msgid "Vaalikokous, osa 3 (toimarien valinta)" msgstr "Election meeting, part 3 (non-board election)" #: .\webapp\templates\kaehmy_export.html:9 -#, fuzzy -#| msgid "Applications" msgid "All applications" -msgstr "Applications" +msgstr "All applications" #: .\webapp\templates\kaehmy_export.html:13 -#, fuzzy -#| msgid "Applications" msgid "Board applications" -msgstr "Applications" +msgstr "Board applications" #: .\webapp\templates\kaehmy_export.html:18 -#, fuzzy -#| msgid "Member applications" msgid "Non-board applications" -msgstr "Member applications" +msgstr "Non-board applications" #: .\webapp\templates\kaehmy_export.html:23 msgid "Front page" @@ -966,10 +1016,8 @@ msgid "Comment" msgstr "" #: .\webapp\templates\kaehmy_list.html:57 -#, fuzzy -#| msgid "List kaehmys" msgid "Filter kaehmys" -msgstr "List applications" +msgstr "Filter kaehmys" #: .\webapp\templates\kaehmy_list.html:70 #: .\webapp\templates\kaehmy_statistics.html:18 @@ -1001,35 +1049,15 @@ msgstr "New application" msgid "Statistics" msgstr "" -#: .\webapp\templates\login.html:25 .\webapp\templates\login.html:27 -msgid "Username" -msgstr "Username" - -#: .\webapp\templates\login.html:31 .\webapp\templates\login.html:33 -msgid "Password" -msgstr "Password" - -#: .\webapp\templates\login.html:43 -msgid "Log in" -msgstr "Log in" - -#: .\webapp\templates\main_index.html:8 -msgid "Infoscreen" -msgstr "Infoscreen" - -#: .\webapp\templates\main_index.html:9 -msgid "Admin tools" -msgstr "Admin tools" - -#: .\webapp\templates\navigation.html:7 +#: .\webapp\templates\navigation.html:6 msgid "Guild" msgstr "Guild" -#: .\webapp\templates\navigation.html:19 .\webapp\templates\sosso.html:7 +#: .\webapp\templates\navigation.html:18 .\webapp\templates\sosso.html:10 msgid "Sössö" msgstr "Sössö" -#: .\webapp\templates\navigation.html:26 +#: .\webapp\templates\navigation.html:25 msgid "Corporate" msgstr "Corporate" @@ -1049,6 +1077,12 @@ msgstr "All challenges" msgid "Total challenges:" msgstr "Total challenges:" +#~ msgid "Infoscreen" +#~ msgstr "Infoscreen" + +#~ msgid "Admin tools" +#~ msgstr "Admin tools" + #~ msgid "" #~ "\n" #~ " first_name, last_name, email_address and place_of_origin " diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 9b35184..e776cb0 100644 Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 688ac0b..400a9b8 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-31 21:09+0100\n" -"PO-Revision-Date: 2017-10-31 22:11+0200\n" +"POT-Creation-Date: 2017-11-02 21:59+0100\n" +"PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: fi\n" @@ -236,7 +236,6 @@ msgstr "Lisätty" #: .\members\models.py:104 .\members\templates\member_add_many_confirm.html:12 #: .\members\templates\members_base.html:52 -#: .\webapp\templates\main_index.html:7 msgid "Members" msgstr "Jäsenet" @@ -285,6 +284,7 @@ msgstr "Muista myös maksaa jäsenmaksusi!" #: .\members\templates\application_index.html:16 #: .\members\templates\member_add_many.html:55 #: .\members\templates\member_add_many_confirm.html:22 +#: .\templates\password_reset\recovery_form.html:10 #: .\webapp\templates\kaehmy_list.html:48 msgid "Send" msgstr "Lähetä" @@ -293,6 +293,12 @@ msgstr "Lähetä" msgid "Member applications" msgstr "Jäsenhakemukset" +#: .\members\templates\application_list.html:20 +#: .\members\templates\member_list.html:44 +#: .\members\templates\payment_list.html:41 +msgid "Download Excel" +msgstr "Lataa Excel" + #: .\members\templates\application_success.html:8 msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty." msgstr "Hienoa! Jäsenhakemuksesi on nyt lähetetty." @@ -415,10 +421,6 @@ msgstr "Hae" msgid "Showing results for" msgstr "Näytetään tulokset haulle" -#: .\members\templates\member_list.html:44 -msgid "Download CSV" -msgstr "Lataa CSV" - #: .\members\templates\members_base.html:33 #: .\members\templates\members_base.html:42 msgid "Member register of SIK ry" @@ -490,45 +492,45 @@ msgstr "englanti" msgid "Submit" msgstr "Lisää" -#: .\members\views\applications.py:51 .\members\views\applications.py:119 -#: .\members\views\applications.py:148 +#: .\members\views\applications.py:51 .\members\views\applications.py:112 +#: .\members\views\applications.py:137 msgid "No application id specified" msgstr "Hakemuksen ID ei määritelty" -#: .\members\views\applications.py:73 +#: .\members\views\applications.py:71 msgid "Application missing 'id' field." msgstr "Hakemuksen ID ei määritelty." -#: .\members\views\applications.py:83 +#: .\members\views\applications.py:80 msgid "Email {} is already in use by a member. Application cannot be accepted." msgstr "Sähköpostiosoite {} on jo käytössä. Hakemusta ei hyväksytty." -#: .\members\views\applications.py:93 +#: .\members\views\applications.py:91 msgid "Successfully accepted application" msgstr "Onnistuneesti hyväksyttiin hakemus" -#: .\members\views\applications.py:123 +#: .\members\views\applications.py:116 msgid "Successfully deleted application" msgstr "Onnistuneesti poistettiin hakemus" -#: .\members\views\applications.py:135 +#: .\members\views\applications.py:126 msgid "Could not delete application object" msgstr "Hakemusobjektia ei voitu poistaa" -#: .\members\views\members.py:74 .\members\views\members.py:179 -#: .\members\views\members.py:206 +#: .\members\views\members.py:73 .\members\views\members.py:175 +#: .\members\views\members.py:199 msgid "No member id specified" msgstr "Jäsenen ID ei määritelty" -#: .\members\views\members.py:111 +#: .\members\views\members.py:114 msgid "Failed to import members" msgstr "Jäsenten tuonti epäonnistui" -#: .\members\views\members.py:125 +#: .\members\views\members.py:128 msgid "Successfully added member" msgstr "Onnistuneesti lisättiin jäsen" -#: .\members\views\members.py:148 +#: .\members\views\members.py:149 msgid "Member missing 'id' field." msgstr "Jäsenen ID ei määritelty." @@ -536,40 +538,40 @@ msgstr "Jäsenen ID ei määritelty." msgid "Successfully updated member" msgstr "Onnistuneesti päivitettiin jäsen" -#: .\members\views\members.py:183 +#: .\members\views\members.py:179 msgid "Successfully deleted member" msgstr "Onnistuneesti poistettiin jäsen" -#: .\members\views\members.py:194 +#: .\members\views\members.py:188 msgid "Could not delete member object" msgstr "Jäsenobjektia ei voitu poistaa" -#: .\members\views\payments.py:70 +#: .\members\views\payments.py:71 msgid "Successfully added payment for member" msgstr "Onnistuneesti lisättiin maksutapahtuma jäsenelle" -#: .\members\views\payments.py:89 .\members\views\payments.py:108 -#: .\members\views\payments.py:128 +#: .\members\views\payments.py:88 .\members\views\payments.py:105 +#: .\members\views\payments.py:123 msgid "No payment id specified" msgstr "Maksutapahtuman ID ei määritelty" -#: .\members\views\payments.py:133 +#: .\members\views\payments.py:128 msgid "Successfully deleted payment" msgstr "Onnistuneesti poistettiin maksutapahtuma" -#: .\members\views\payments.py:143 +#: .\members\views\payments.py:136 msgid "Could not delete payment object" msgstr "Maksutapahtumaobjektia ei voitu poistaa" -#: .\members\views\payments.py:163 +#: .\members\views\payments.py:156 msgid "Successfully updated payment" msgstr "Onnistuneesti päivitettiin maksutapahtuma" -#: .\members\views\payments.py:170 +#: .\members\views\payments.py:161 msgid "Could not update payment object" msgstr "Maksutapahtumaobjektia ei voitu päivittää" -#: .\members\views\utils.py:121 +#: .\members\views\utils.py:119 msgid "Missing CSV file" msgstr "Puuttuva CSV-tiedosto" @@ -577,6 +579,11 @@ msgstr "Puuttuva CSV-tiedosto" msgid "Go" msgstr "Vaihda" +#: .\templates\base.html:14 .\webapp\templates\kaehmy_base.html:14 +#: .\webapp\templates\main_index.html:9 +msgid "Aalto-yliopiston Sähköinsinöörikilta ry" +msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" + #: .\templates\error.html:8 .\webapp\templates\kaehmy_error.html:8 msgid "Error" msgstr "Virhe" @@ -585,10 +592,73 @@ msgstr "Virhe" msgid "Back" msgstr "Takaisin" -#: .\templates\footer.html:23 .\webapp\templates\kaehmy_footer.html:23 +#: .\templates\footer.html:10 .\templates\footer.html:60 +#: .\webapp\templates\kaehmy_footer.html:23 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" +#: .\templates\login.html:12 .\templates\login.html:13 +msgid "Username" +msgstr "Käyttäjänimi" + +#: .\templates\login.html:16 .\templates\login.html:17 +msgid "Password" +msgstr "Salasana" + +#: .\templates\login.html:20 +msgid "Forgot password?" +msgstr "Unohditko salasanasi?" + +#: .\templates\login.html:26 +msgid "Log in" +msgstr "Kirjaudu sisään" + +#: .\templates\password_reset\recovery_done.html:3 +msgid "New password set" +msgstr "Uusi salasana asetettu" + +#: .\templates\password_reset\recovery_done.html:6 +msgid "" +"Your password has successfully been reset. You can use it right now on the " +"login page." +msgstr "" +"Salasanasi on asetettu onnistuneesti. Voit käyttää sitä nyt kirjautuessasi." + +#: .\templates\password_reset\recovery_form.html:4 +msgid "Password recovery" +msgstr "Salasanan palautus" + +#: .\templates\password_reset\reset.html:5 +#, python-format +msgid "" +"Sorry, this password reset link is invalid. You can still request a new one." +msgstr "" +"Pahoittelut, tämä salasanan palautuslinkki on epäkelpo. Voit kuitenkin hankkia uuden." + +#: .\templates\password_reset\reset.html:7 +#, python-format +msgid "Hi, %(username)s. Please choose your new password." +msgstr "Hei, %(username)s. Valitse uusi salasanasi." + +#: .\templates\password_reset\reset.html:11 +msgid "Set new password" +msgstr "Aseta uusi salasana" + +#: .\templates\password_reset\reset_sent.html:4 +msgid "Password recovery sent" +msgstr "Salasanan palautusviesti lähetetty" + +#: .\templates\password_reset\reset_sent.html:7 +#, python-format +msgid "" +"An email was sent to %(email)s %(ago)s ago. Use the link in " +"it to set a new password." +msgstr "" +"Sähköposti on lähetetty osoitteeseen %(email)s %(ago)s:a " +"sitten. Käytä linkkiä asettaaksesi uuden salasanan." + #: .\webapp\forms.py:38 msgid "Email (not public)" msgstr "Sähköposti (ei julkinen)" @@ -665,13 +735,13 @@ msgstr "Ilmoittautumiset" msgid "Corporate affairs" msgstr "Yrityssuhteet" -#: .\webapp\models.py:95 .\webapp\templates\freshmen.html:7 -#: .\webapp\templates\navigation.html:10 +#: .\webapp\models.py:95 .\webapp\templates\freshmen.html:10 +#: .\webapp\templates\navigation.html:9 msgid "Freshmen" msgstr "Fuksit" -#: .\webapp\models.py:96 .\webapp\templates\international.html:7 -#: .\webapp\templates\navigation.html:16 +#: .\webapp\models.py:96 .\webapp\templates\international.html:10 +#: .\webapp\templates\navigation.html:15 msgid "International" msgstr "International" @@ -839,24 +909,20 @@ msgstr "Telegram-kanavat" msgid "SIK Admin" msgstr "SIK Hallintapaneeli" -#: .\webapp\templates\base.html:15 .\webapp\templates\kaehmy_base.html:14 -msgid "Aalto-yliopiston Sähköinsinöörikilta ry" -msgstr "Aalto-yliopiston Sähköinsinöörikilta ry" - -#: .\webapp\templates\contact.html:7 .\webapp\templates\navigation.html:22 +#: .\webapp\templates\contact.html:10 .\webapp\templates\navigation.html:21 msgid "Contact" msgstr "Yhteystiedot" -#: .\webapp\templates\event_calendar.html:7 -#: .\webapp\templates\navigation.html:13 +#: .\webapp\templates\event_calendar.html:10 +#: .\webapp\templates\navigation.html:12 msgid "Event calendar" msgstr "Tapahtumakalenteri" -#: .\webapp\templates\guild.html:7 +#: .\webapp\templates\guild.html:10 msgid "Kilta" msgstr "Kilta" -#: .\webapp\templates\jobs.html:7 .\webapp\templates\navigation.html:29 +#: .\webapp\templates\jobs.html:10 .\webapp\templates\navigation.html:28 msgid "Jobs" msgstr "Työpaikat" @@ -983,35 +1049,15 @@ msgstr "Uusi kaehmy" msgid "Statistics" msgstr "Kaehmytilastot" -#: .\webapp\templates\login.html:25 .\webapp\templates\login.html:27 -msgid "Username" -msgstr "Käyttäjänimi" - -#: .\webapp\templates\login.html:31 .\webapp\templates\login.html:33 -msgid "Password" -msgstr "Salasana" - -#: .\webapp\templates\login.html:43 -msgid "Log in" -msgstr "Kirjaudu sisään" - -#: .\webapp\templates\main_index.html:8 -msgid "Infoscreen" -msgstr "Infonäyttö" - -#: .\webapp\templates\main_index.html:9 -msgid "Admin tools" -msgstr "Hallintatyökalut" - -#: .\webapp\templates\navigation.html:7 +#: .\webapp\templates\navigation.html:6 msgid "Guild" msgstr "Kilta" -#: .\webapp\templates\navigation.html:19 .\webapp\templates\sosso.html:7 +#: .\webapp\templates\navigation.html:18 .\webapp\templates\sosso.html:10 msgid "Sössö" msgstr "Sössö" -#: .\webapp\templates\navigation.html:26 +#: .\webapp\templates\navigation.html:25 msgid "Corporate" msgstr "Yritys" @@ -1031,6 +1077,12 @@ msgstr "Kaikki haasteet" msgid "Total challenges:" msgstr "Haasteita yhteensä:" +#~ msgid "Infoscreen" +#~ msgstr "Infonäyttö" + +#~ msgid "Admin tools" +#~ msgstr "Hallintatyökalut" + #~ msgid "" #~ "\n" #~ " first_name, last_name, email_address and place_of_origin "