diff --git a/website/branding/locale/sv/LC_MESSAGES/django.mo b/website/branding/locale/sv/LC_MESSAGES/django.mo index 930d3d00..9d79e17e 100644 Binary files a/website/branding/locale/sv/LC_MESSAGES/django.mo and b/website/branding/locale/sv/LC_MESSAGES/django.mo differ diff --git a/website/branding/locale/sv/LC_MESSAGES/django.po b/website/branding/locale/sv/LC_MESSAGES/django.po index 32bfef99..ded2d619 100644 --- a/website/branding/locale/sv/LC_MESSAGES/django.po +++ b/website/branding/locale/sv/LC_MESSAGES/django.po @@ -1,13 +1,8 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-31 11:25+0200\n" +"POT-Creation-Date: 2017-04-04 14:37+0200\n" "PO-Revision-Date: 2017-03-31 11:21+0200\n" "Last-Translator: Jip J. Dekker \n" "Language-Team: \n" diff --git a/website/involvement/locale/sv/LC_MESSAGES/django.mo b/website/involvement/locale/sv/LC_MESSAGES/django.mo index b4055603..ca2ea27d 100644 Binary files a/website/involvement/locale/sv/LC_MESSAGES/django.mo and b/website/involvement/locale/sv/LC_MESSAGES/django.mo differ diff --git a/website/involvement/locale/sv/LC_MESSAGES/django.po b/website/involvement/locale/sv/LC_MESSAGES/django.po index 4fb7fedb..d98d02d3 100644 --- a/website/involvement/locale/sv/LC_MESSAGES/django.po +++ b/website/involvement/locale/sv/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-31 11:25+0200\n" -"PO-Revision-Date: 2017-03-31 11:15+0200\n" +"POT-Creation-Date: 2017-04-04 14:37+0200\n" +"PO-Revision-Date: 2017-04-04 15:02+0200\n" "Last-Translator: Jip J. Dekker \n" "Language-Team: \n" "Language: sv_SE\n" @@ -52,7 +52,7 @@ msgid "" "User %(user)s already applied for this position and can not be appointed " "through the overturn field." msgstr "" -"Användaren %(user)s har redan sökt den här posten och kan inte bli tillsatt " +"Användaren %(user)s har redan sökt den här posten och kan inte bli tillsatt" #: involvement/forms.py:126 #, python-format @@ -570,10 +570,8 @@ msgid "This application does not exist!" msgstr "Den här ansökan finns inte! " #: involvement/views.py:119 -#, fuzzy -#| msgid "Your application has been removed!" msgid "Your application has been submitted!" -msgstr "Din ansökan har tagits bort! " +msgstr "Din ansökan har skickats!" #: involvement/views.py:152 involvement/views.py:200 msgid "Your decisions have successfully been saved." diff --git a/website/members/locale/sv/LC_MESSAGES/django.mo b/website/members/locale/sv/LC_MESSAGES/django.mo index 948a1c9b..10b1fca4 100644 Binary files a/website/members/locale/sv/LC_MESSAGES/django.mo and b/website/members/locale/sv/LC_MESSAGES/django.mo differ diff --git a/website/members/locale/sv/LC_MESSAGES/django.po b/website/members/locale/sv/LC_MESSAGES/django.po index ac30ae81..61cc2a0c 100644 --- a/website/members/locale/sv/LC_MESSAGES/django.po +++ b/website/members/locale/sv/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-31 11:25+0200\n" -"PO-Revision-Date: 2017-03-31 11:22+0200\n" +"POT-Creation-Date: 2017-04-04 14:37+0200\n" +"PO-Revision-Date: 2017-04-04 15:00+0200\n" "Last-Translator: Jip J. Dekker \n" "Language-Team: \n" "Language: sv\n" @@ -17,91 +17,136 @@ msgstr "" msgid "UTN Member Management" msgstr "Underhåll av UTN-medlemmar" -#: members/forms.py:16 members/forms.py:108 members/forms.py:165 +#: members/forms.py:16 members/forms.py:103 members/forms.py:165 msgid "Person number using the YYYYMMDD-XXXX format." msgstr "Personnummer på formen ÅÅÅÅMDD-NNNN." -#: members/forms.py:19 members/forms.py:111 members/forms.py:168 +#: members/forms.py:19 members/forms.py:106 members/forms.py:168 msgid "Use the format YYYYMMDD-XXXX for your person number." msgstr "Använd formen ÅÅÅÅMMDD-NNNN för ditt personnummer." -#: members/forms.py:121 members/forms.py:178 members/models.py:125 +#: members/forms.py:116 members/forms.py:178 members/models.py:203 msgid "Phone number" msgstr "Telefonnummer" -#: members/forms.py:125 members/forms.py:182 members/models.py:139 +#: members/forms.py:120 members/forms.py:182 members/models.py:216 msgid "Registration year" msgstr "Inskrivningsår" -#: members/forms.py:130 members/forms.py:187 +#: members/forms.py:125 members/forms.py:187 msgid "Study Program" msgstr "Program" -#: members/forms.py:134 members/forms.py:192 members/models.py:111 +#: members/forms.py:130 members/forms.py:192 +msgid "Section" +msgstr "Sektion" + +#: members/forms.py:134 members/forms.py:197 members/models.py:190 msgid "Membership status" -msgstr "" +msgstr "Medlemsstatus" -#: members/models.py:18 -#, fuzzy -#| msgid "Study Program" +#: members/models.py:22 msgid "study program" -msgstr "Program" +msgstr "program" -#: members/models.py:19 -#, fuzzy -#| msgid "Study Programs" +#: members/models.py:23 msgid "study programs" -msgstr "Program" +msgstr "program" -#: members/models.py:22 -msgid "Bachelor's Degree" -msgstr "Kandidatexamen" +#: members/models.py:26 +msgid "Bachelor of Science" +msgstr "Kandidatprogram" -#: members/models.py:23 -msgid "Master's Degree" -msgstr "Masterexamen" +#: members/models.py:27 +msgid "Master of Science" +msgstr "Masterprogram" -#: members/models.py:24 -msgid "Engineer's Degree" -msgstr "Civilingenjörsexamen" +#: members/models.py:28 +msgid "Bachelor of Engineering" +msgstr "Högskoleingenjörsprogrammet" #: members/models.py:29 +msgid "Master of Science in Engineering" +msgstr "Civilingenjörsprogrammet" + +#: members/models.py:34 msgid "English program name" msgstr "Engelsk benämning av program" -#: members/models.py:30 members/models.py:38 +#: members/models.py:35 members/models.py:42 msgid "Enter the name of the study program" msgstr "Ange namnet på programmet" -#: members/models.py:37 +#: members/models.py:41 msgid "Swedish program name" msgstr "Svensk benämning av program" -#: members/models.py:47 +#: members/models.py:50 msgid "English program abbreviation" msgstr "Engelsk förkortning av program" -#: members/models.py:48 members/models.py:56 +#: members/models.py:51 members/models.py:58 msgid "Enter the abbreviation for the study program" msgstr "Ange den engelska förkortningen på programmet" -#: members/models.py:55 +#: members/models.py:57 msgid "Swedish program abbreviation" msgstr "Svensk förkortning av program" -#: members/models.py:66 +#: members/models.py:67 msgid "Degree type" msgstr "Examensnivå" -#: members/models.py:81 +#: members/models.py:73 +#, python-format +msgid "%(degree_type)s in %(study_program)s" +msgstr "%(degree_type)s i %(study_program)s" + +#: members/models.py:88 members/models.py:146 +msgid "General" +msgstr "Generell" + +#: members/models.py:102 +msgid "section" +msgstr "sektion" + +#: members/models.py:103 +msgid "sections" +msgstr "sektioner" + +#: members/models.py:107 +msgid "English section name" +msgstr "Sektionens engelska namn" + +#: members/models.py:108 members/models.py:115 +msgid "Enter the name of the section" +msgstr "Ange namnet på sektionen" + +#: members/models.py:114 +msgid "Swedish section name" +msgstr "Sektionens svenska namn" + +#: members/models.py:123 +msgid "Section abbreviation" +msgstr "Sektionens bokstavsförkortning" + +#: members/models.py:124 +msgid "Enter the abbreviation for the section" +msgstr "Ange sektionens bokstavsförkortning" + +#: members/models.py:150 +msgid "Studies" +msgstr "Studier" + +#: members/models.py:161 msgid "Birthday" msgstr "Födelsedag" -#: members/models.py:87 +#: members/models.py:167 msgid "Person number extension" msgstr "De fyra sista siffrorna" -#: members/models.py:88 +#: members/models.py:168 msgid "" "Enter the last four digits of your Swedish person number, given by the " "Swedish tax authority" @@ -109,43 +154,59 @@ msgstr "" "Ange de fyra sista siffrorna i ditt svenska personnummer, som du fått från " "Skatteverket" -#: members/models.py:92 +#: members/models.py:172 msgid "The person number extension consists of four numbers" msgstr "Här avses de fyra sista siffrorna i ditt personnummer" -#: members/models.py:102 +#: members/models.py:181 msgid "Unknown" -msgstr "" +msgstr "Okänt" -#: members/models.py:103 +#: members/models.py:182 msgid "Nonmember" -msgstr "" +msgstr "Icke medlem" -#: members/models.py:104 +#: members/models.py:183 msgid "Member" -msgstr "" +msgstr "Medlem" -#: members/models.py:105 +#: members/models.py:184 msgid "Alumnus" -msgstr "" +msgstr "Alumn" -#: members/models.py:126 +#: members/models.py:204 msgid "Enter a phone number so UTN may reach you" msgstr "Ange ett telefonnummer som UTN kan nå dig på" -#: members/models.py:129 +#: members/models.py:207 msgid "Please enter a valid phone number" msgstr "Var vänlig ange ett giltigt telefonnummer" -#: members/models.py:140 +#: members/models.py:217 msgid "Enter the year you started studying at the TakNat faculty" msgstr "Ange året då du började studera på TekNat-fakulteten" -#: members/models.py:144 +#: members/models.py:221 msgid "Please enter a valid year" msgstr "Vänligen ange ett giltigt år" -#: members/templates/members/email_change_email.html:2 +#: members/models.py:228 +msgid "Study program" +msgstr "Program" + +#: members/models.py:236 +msgid "Member of section" +msgstr "Sektionsmedlem i" + +#: members/templates/members/email_change_email.html:1 +msgid "" +"You're receiving this email because a UTN-account has been created with this " +"e-mail address." +msgstr "" +"Du får detta mail eftersom du har registrerat ett UTN-konto på denna " +"emailadress" + +#: members/templates/members/email_change_email.html:1 msgid "" "You're receiving this email because you registered a new e-mail address for " "your UTN-account." @@ -153,43 +214,47 @@ msgstr "" "Du får detta mail eftersom du har registrerat en ny emailadress för ditt UTN-" "konto" -#: members/templates/members/email_change_email.html:4 -msgid "Please go to the following page to confirm your e-mail address:" -msgstr "Fortsätt till denna sida för att bekräfta din emailadress:" +#: members/templates/members/email_change_email.html:2 +msgid "Please go to the following page to confirm your e-mail address" +msgstr "Fortsätt till denna sida för att bekräfta din emailadress" + +#: members/templates/members/email_change_email.html:2 +msgid " and complete your profile" +msgstr "och slutför din profil" #: members/templates/members/email_change_subject.txt:2 msgid "[UTN] Confirm your e-mail address" msgstr "[UTN] Bekräfta din emailadress" -#: members/templates/members/profile.html:4 members/views.py:17 +#: members/templates/members/profile.html:4 members/views.py:18 msgid "Account Settings" msgstr "Kontoanställningar" -#: members/templates/members/profile.html:36 +#: members/templates/members/profile.html:62 msgid "contact information" msgstr "kontaktinformation" -#: members/templates/members/profile.html:89 +#: members/templates/members/profile.html:115 msgid "membership status" -msgstr "" +msgstr "medlemsstatus" -#: members/templates/members/profile.html:90 +#: members/templates/members/profile.html:116 msgid "current status" -msgstr "" +msgstr "nuvarande status" -#: members/templates/members/profile.html:93 +#: members/templates/members/profile.html:119 msgid "Is this incorrect?" -msgstr "" +msgstr "Är detta fel?" -#: members/templates/members/profile.html:93 +#: members/templates/members/profile.html:119 msgid "recheck status" -msgstr "" +msgstr "uppdatera status" -#: members/templates/members/profile.html:98 +#: members/templates/members/profile.html:124 msgid "study information" msgstr "utbildningsinformation" -#: members/templates/members/profile.html:121 +#: members/templates/members/profile.html:153 msgid "save" msgstr "spara" @@ -202,7 +267,7 @@ msgstr "Registrera " msgid "Create a UTN account" msgstr "Skapa ett UTN-konto" -#: members/templates/members/register.html:87 +#: members/templates/members/register.html:71 msgid "register" msgstr "register" @@ -309,10 +374,8 @@ msgid "Your password has been set. You may go ahead and log in now." msgstr "Ditt lösenord har aktiverats. Du kan använda det för att logga in nu. " #: members/templates/registration/password_reset_complete.html:14 -#, fuzzy -#| msgid "Login" msgid "login" -msgstr "Logga in" +msgstr "logga in" #: members/templates/registration/password_reset_confirm.html:13 msgid "" @@ -394,25 +457,24 @@ msgstr "Återställ mitt lösenord" #: members/templates/registration/password_reset_subject.txt:2 msgid "[UTN] Password reset request" -msgstr "[UTN] " +msgstr "[UTN] Återställ lösenord" -#: members/views.py:24 +#: members/views.py:25 msgid "Your account settings have been saved." msgstr "Dina kontoinställningar har sparats." -#: members/views.py:31 -#, fuzzy -#| msgid "Your e-mail address has been confirmed." +#: members/views.py:32 msgid "Your newly set e-mail address has not yet been confirmed" -msgstr "Din emailadress har bekräftats." +msgstr "Din nya emailadress har inte bekräftats" -#: members/views.py:54 +#: members/views.py:57 msgid "Your e-mail address has been confirmed." msgstr "Din emailadress har bekräftats." -#: members/views.py:57 +#: members/views.py:60 msgid "The provided confirmation token was invalid." msgstr "Bekräftelselänken var ogiltig" -#~ msgid "New password confirmation" -#~ msgstr "Bekräftelse av nytt lösenord" +#: members/wagtail_hooks.py:27 +msgid "Education" +msgstr "Utbildning" diff --git a/website/members/wagtail_hooks.py b/website/members/wagtail_hooks.py index 325d873f..d942d2f8 100644 --- a/website/members/wagtail_hooks.py +++ b/website/members/wagtail_hooks.py @@ -6,6 +6,7 @@ class StudyProgramAdmin(ModelAdmin): model = StudyProgram + menu_label = _('Study Program') menu_icon = 'fa-graduation-cap' menu_order = 510 add_to_settings_menu = False @@ -16,6 +17,7 @@ class StudyProgramAdmin(ModelAdmin): class SectionAdmin(ModelAdmin): model = Section + menu_label = _('Sections') menu_icon = 'fa-eye' menu_order = 520 add_to_settings_menu = False diff --git a/website/website/locale/sv/LC_MESSAGES/django.mo b/website/website/locale/sv/LC_MESSAGES/django.mo index ae1bafe4..6d738389 100644 Binary files a/website/website/locale/sv/LC_MESSAGES/django.mo and b/website/website/locale/sv/LC_MESSAGES/django.mo differ diff --git a/website/website/locale/sv/LC_MESSAGES/django.po b/website/website/locale/sv/LC_MESSAGES/django.po index 38b27168..9c1cbaa0 100644 --- a/website/website/locale/sv/LC_MESSAGES/django.po +++ b/website/website/locale/sv/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-31 11:25+0200\n" +"POT-Creation-Date: 2017-04-04 14:37+0200\n" "PO-Revision-Date: 2017-03-23 14:44+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -13,11 +13,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.12\n" -#: website/settings/base.py:116 +#: website/settings/base.py:117 msgid "English" msgstr "engelska" -#: website/settings/base.py:117 +#: website/settings/base.py:118 msgid "Swedish" msgstr "svenska"