diff --git a/CHANGELOG.md b/CHANGELOG.md index b02d8303a..b5665bccb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ Lastly, a new [release](https://github.com/MAKENTNU/web/releases) must be create ### Improvements - +- Added shortcuts to machine page, to help users navigate ### Fixes diff --git a/src/locale/nb/LC_MESSAGES/django.mo b/src/locale/nb/LC_MESSAGES/django.mo index e1560e228..88e75eefc 100644 Binary files a/src/locale/nb/LC_MESSAGES/django.mo and b/src/locale/nb/LC_MESSAGES/django.mo differ diff --git a/src/locale/nb/LC_MESSAGES/django.po b/src/locale/nb/LC_MESSAGES/django.po index d46c8b205..d5be3d760 100644 --- a/src/locale/nb/LC_MESSAGES/django.po +++ b/src/locale/nb/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: MAKE NTNU website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-03-05 10:50+0100\n" +"POT-Creation-Date: 2025-12-11 20:04+0100\n" "PO-Revision-Date: 2018-10-09 14:05+0200\n" "Last-Translator: Sindre Stephansen \n" "Language-Team: Norwegian Bokmål \n" @@ -14,29 +14,29 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2.1\n" -#: src/announcements/admin.py:14 src/announcements/admin.py:23 +#: src/announcements/admin.py:27 src/announcements/admin.py:38 #: src/news/templates/news/event/admin_time_place_listing.html:26 msgid "shown" msgstr "vist" -#: src/announcements/admin.py:30 src/announcements/models.py:54 +#: src/announcements/admin.py:45 src/announcements/models.py:59 msgid "link" msgstr "lenke" -#: src/announcements/models.py:44 +#: src/announcements/models.py:42 #: src/make_queue/templates/make_queue/reservation_list.html:63 msgid "Information" msgstr "Informasjon" -#: src/announcements/models.py:45 +#: src/announcements/models.py:43 msgid "Warning" msgstr "Advarsel" -#: src/announcements/models.py:46 +#: src/announcements/models.py:44 msgid "Critical" msgstr "Kritisk" -#: src/announcements/models.py:49 +#: src/announcements/models.py:47 msgid "type" msgstr "type" @@ -45,7 +45,7 @@ msgstr "type" msgid "site-wide" msgstr "hele nettsiden" -#: src/announcements/models.py:51 +#: src/announcements/models.py:52 msgid "" "If selected, the announcement will be shown on all pages, otherwise it is " "only shown on the front page." @@ -53,29 +53,29 @@ msgstr "" "Hvis valgt vil kunngjøringen vises på hele nettsiden, ellers vil den kun " "vises på forsiden." -#: src/announcements/models.py:53 src/contentbox/models.py:21 -#: src/docs/models.py:51 src/make_queue/models/machine.py:206 -#: src/news/models.py:40 +#: src/announcements/models.py:56 src/contentbox/models.py:24 +#: src/docs/models.py:58 src/make_queue/models/machine.py:270 +#: src/news/models.py:43 msgid "content" msgstr "innhold" -#: src/announcements/models.py:55 +#: src/announcements/models.py:60 msgid "An optional link to an information page." msgstr "En valgfri lenke til en informasjonsside." -#: src/announcements/models.py:56 +#: src/announcements/models.py:64 msgid "display from" msgstr "vis fra" -#: src/announcements/models.py:57 +#: src/announcements/models.py:65 msgid "The date from which the announcement will be shown." msgstr "Kunngjøringen vil vises fra dette tidspunktet." -#: src/announcements/models.py:58 +#: src/announcements/models.py:70 msgid "display to" msgstr "vis til" -#: src/announcements/models.py:59 +#: src/announcements/models.py:72 msgid "" "The announcement will be shown until this date. If none is given, it is " "shown indefinitely." @@ -119,86 +119,86 @@ msgstr "Fra" msgid "Admin page for announcements" msgstr "Administrasjonsside for kunngjøringer" -#: src/announcements/views.py:40 +#: src/announcements/views.py:42 msgid "Add Announcement" msgstr "Legg til kunngjøring" -#: src/announcements/views.py:41 +#: src/announcements/views.py:43 #: src/checkin/templates/checkin/admin_suggest_skill.html:37 #: src/checkin/templates/checkin/profile_detail_internal.html:79 -#: src/docs/views.py:95 src/faq/views.py:65 src/faq/views.py:93 -#: src/internal/views.py:87 src/internal/views.py:264 -#: src/internal/views.py:309 +#: src/docs/views.py:121 src/faq/views.py:76 src/faq/views.py:104 +#: src/internal/views.py:95 src/internal/views.py:294 +#: src/internal/views.py:344 #: src/make_queue/templates/make_queue/course/printer_3d_course_create.html:12 #: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:18 #: src/make_queue/templates/make_queue/machine_list.html:21 -#: src/make_queue/views/machine.py:178 src/make_queue/views/quota.py:88 -#: src/make_queue/views/reservation_rule.py:74 src/makerspace/views.py:54 -#: src/news/views/article.py:88 src/news/views/event.py:237 -#: src/news/views/event.py:324 +#: src/make_queue/views/machine.py:228 src/make_queue/views/quota.py:112 +#: src/make_queue/views/reservation_rule.py:94 src/makerspace/views.py:60 +#: src/news/views/article.py:105 src/news/views/event.py:317 +#: src/news/views/event.py:417 msgid "Add" msgstr "Legg til" -#: src/announcements/views.py:47 +#: src/announcements/views.py:51 msgid "Change Announcement" msgstr "Endre kunngjøring" -#: src/card/formfields.py:20 src/card/modelfields.py:16 -#: src/checkin/models.py:96 +#: src/card/formfields.py:22 src/card/modelfields.py:18 +#: src/checkin/models.py:129 #: src/internal/templates/internal/member_list.html:306 #: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:99 -#: src/make_queue/views/course.py:124 +#: src/make_queue/views/course.py:139 msgid "card number" msgstr "kortnummer" -#: src/card/modelfields.py:19 +#: src/card/modelfields.py:21 msgid "Card number already in use" msgstr "Kortnummeret er allerede i bruk" #: src/card/templates/card/widgets/card_number_input.html:11 -#: src/card/validators.py:6 +#: src/card/validators.py:7 msgid "Card number must be between seven and ten digits long." msgstr "Kortnummeret må være mellom syv og ti siffer langt." -#: src/card/validators.py:8 +#: src/card/validators.py:11 msgid "Card number must be ten digits long." msgstr "Kortnummeret må være ti siffer langt." -#: src/checkin/models.py:10 src/checkin/models.py:71 +#: src/checkin/models.py:11 src/checkin/models.py:92 #: src/checkin/templates/checkin/admin_suggest_skill.html:29 msgid "title (Norwegian)" msgstr "tittel (norsk)" -#: src/checkin/models.py:11 src/checkin/models.py:72 +#: src/checkin/models.py:18 src/checkin/models.py:99 #: src/checkin/templates/checkin/admin_suggest_skill.html:43 msgid "title (English)" msgstr "tittel (engelsk)" -#: src/checkin/models.py:13 src/checkin/models.py:78 +#: src/checkin/models.py:25 src/checkin/models.py:110 msgid "illustration image" msgstr "illustrasjonsbilde" -#: src/checkin/models.py:31 +#: src/checkin/models.py:48 msgid "profile picture" msgstr "profilbilde" -#: src/checkin/models.py:32 +#: src/checkin/models.py:50 msgid "checked in" msgstr "innsjekket" -#: src/checkin/models.py:33 +#: src/checkin/models.py:52 msgid "last checked in" msgstr "sist sjekket inn" -#: src/checkin/models.py:41 +#: src/checkin/models.py:61 msgid "Beginner" msgstr "Nybegynner" -#: src/checkin/models.py:42 +#: src/checkin/models.py:62 msgid "Experienced" msgstr "Viderekommen" -#: src/checkin/models.py:43 +#: src/checkin/models.py:63 msgid "Expert" msgstr "Ekspert" @@ -318,12 +318,12 @@ msgstr "" "Legg kortet på kortleseren og trykk på knappen under for å registrere kortet" #: src/checkin/templates/checkin/profile_detail_internal.html:94 -#: src/news/views/event.py:379 +#: src/news/views/event.py:484 msgid "Register" msgstr "Registrer" #: src/checkin/templates/checkin/profile_detail_internal.html:97 -#: src/internal/forms.py:43 src/make_queue/forms/course.py:68 +#: src/internal/forms.py:58 src/make_queue/forms/course.py:83 msgid "Card number is already in use" msgstr "Kortnummeret er allerede i bruk" @@ -337,15 +337,15 @@ msgstr "Kontakt %(email)s for å fikse problemet." msgid "People with these skills are at
Makerverkstedet right now" msgstr "Folk med disse ferdighetene er på
Makerverkstedet akkurat nå" -#: src/checkin/views.py:120 +#: src/checkin/views.py:128 msgid "You have completed the 3D printer course" msgstr "Du har fullført 3D-printerkurset" -#: src/checkin/views.py:121 +#: src/checkin/views.py:130 msgid "You have not taken the 3D printer course" msgstr "Du har ikke tatt 3D-printerkurset" -#: src/checkin/views.py:123 +#: src/checkin/views.py:133 msgid "" "To use a 3D printer, make a reservation in the calendar of one of the 3D " "printers on the “Reservations” page." @@ -353,15 +353,15 @@ msgstr "" "For å bruke en 3D-printer, lag en reservasjon i kalenderen til en av 3D-" "printerne på «Reservasjoner»-siden." -#: src/checkin/views.py:132 +#: src/checkin/views.py:143 msgid "You have completed the {} course" msgstr "Du har fullført {}kurset" -#: src/checkin/views.py:133 +#: src/checkin/views.py:147 msgid "You have not taken the {} course" msgstr "Du har ikke tatt {}kurset" -#: src/checkin/views.py:135 +#: src/checkin/views.py:149 msgid "" "To use a {}, make a reservation in the calendar of one of the {}s on the " "“Reservations” page." @@ -369,51 +369,51 @@ msgstr "" "For å bruke en {}, lag en reservasjon i kalenderen til en av {}ne på " "«Reservasjoner»-siden." -#: src/checkin/views.py:175 src/checkin/views.py:178 +#: src/checkin/views.py:195 src/checkin/views.py:198 msgid "Enter both norwegian and english skill name" msgstr "Skriv inn tittel på både norsk og engelsk" -#: src/checkin/views.py:185 +#: src/checkin/views.py:207 msgid "Skill already exists!" msgstr "Ferdigheten finnes allerede!" -#: src/checkin/views.py:203 +#: src/checkin/views.py:229 msgid "Skill added!" msgstr "Ferdighet lagt til!" -#: src/contentbox/admin.py:22 src/contentbox/models.py:26 +#: src/contentbox/admin.py:25 src/contentbox/models.py:29 msgid "extra change permissions" msgstr "ekstra endringsrettigheter" -#: src/contentbox/models.py:18 +#: src/contentbox/models.py:21 msgid "URL name" msgstr "URL-navn" -#: src/contentbox/models.py:20 src/docs/models.py:15 -#: src/internal/models.py:261 src/makerspace/models.py:23 -#: src/news/models.py:39 +#: src/contentbox/models.py:23 src/docs/models.py:19 +#: src/internal/models.py:310 src/makerspace/models.py:25 +#: src/news/models.py:42 msgid "title" msgstr "tittel" -#: src/contentbox/models.py:27 +#: src/contentbox/models.py:31 msgid "Extra permissions that are required for changing the content box." msgstr "Ekstra rettigheter som kreves for å kunne endre på innholdsboksen." -#: src/contentbox/models.py:29 src/docs/models.py:60 src/faq/models.py:42 -#: src/groups/models.py:39 src/groups/models.py:111 -#: src/internal/models.py:62 src/internal/models.py:208 -#: src/internal/models.py:280 +#: src/contentbox/models.py:34 src/docs/models.py:67 src/faq/models.py:50 +#: src/groups/models.py:39 src/groups/models.py:118 +#: src/internal/models.py:81 src/internal/models.py:249 +#: src/internal/models.py:329 #: src/internal/templates/internal/secret_list.html:67 -#: src/make_queue/models/course.py:15 src/make_queue/models/course.py:46 -#: src/make_queue/models/machine.py:153 -#: src/make_queue/models/machine.py:207 -#: src/make_queue/models/reservation.py:313 src/makerspace/models.py:33 -#: src/news/models.py:51 src/news/models.py:207 +#: src/make_queue/models/course.py:25 src/make_queue/models/course.py:66 +#: src/make_queue/models/machine.py:197 +#: src/make_queue/models/machine.py:271 +#: src/make_queue/models/reservation.py:367 src/makerspace/models.py:39 +#: src/news/models.py:66 src/news/models.py:264 msgid "last modified" msgstr "sist endret" #: src/contentbox/templates/contentbox/content_box_detail.html:18 -#: src/contentbox/views.py:120 +#: src/contentbox/views.py:134 #: src/docs/templates/docs/documentation_page_detail.html:49 #: src/faq/templates/faq/faq_list.html:40 #: src/make_queue/templates/make_queue/machine_usage_rule_detail.html:24 @@ -444,32 +444,32 @@ msgstr "Avbryt og gå til forsiden" msgid "Continue changing in Django admin" msgstr "Fortsett å endre i Django-admin" -#: src/contentbox/views.py:95 +#: src/contentbox/views.py:105 msgid "Cannot change this ContentBox on this subdomain" msgstr "Kan ikke endre denne ContentBox-en på dette subdomenet" -#: src/contentbox/views.py:132 +#: src/contentbox/views.py:148 msgctxt "view page" msgid "View" msgstr "Se" -#: src/docs/forms.py:26 +#: src/docs/forms.py:27 msgid "The page is currently empty; please add some content." msgstr "Siden er for øyeblikket tom; vennligst legg til noe innhold." -#: src/docs/forms.py:43 +#: src/docs/forms.py:45 msgid "The content must be changed in order to create a new version." msgstr "Innholdet må endres på for å lage en ny versjon." -#: src/docs/forms.py:77 +#: src/docs/forms.py:79 msgid "The content does not belong to the given page" msgstr "Dette innholdet hører ikke til denne siden" -#: src/docs/models.py:49 +#: src/docs/models.py:56 msgid "page" msgstr "side" -#: src/docs/models.py:58 +#: src/docs/models.py:65 msgid "made by" msgstr "gjort av" @@ -543,7 +543,7 @@ msgid "Changed by" msgstr "Endret av" #: src/docs/templates/docs/documentation_page_history_detail.html:34 -#: src/docs/views.py:68 +#: src/docs/views.py:88 msgid "Anonymous" msgstr "Anonym" @@ -575,59 +575,59 @@ msgstr "" "The finnes ingen dokumenter som samsvarer med det søket. Vennligst prøv et " "annet søk." -#: src/docs/templates/docs/header.html:19 src/docs/views.py:102 +#: src/docs/templates/docs/header.html:19 src/docs/views.py:130 msgid "Add page" msgstr "Legg til side" #: src/docs/templates/docs/header.html:29 #: src/news/templates/email/ticket.html:22 #: src/web/templates/web/base.html:26 src/web/templates/web/footer.html:11 -#: src/web/templates/web/header.html:22 src/web/templates/web/index.html:39 +#: src/web/templates/web/header.html:22 src/web/templates/web/index.html:45 msgid "MAKE NTNU's logo" msgstr "MAKE NTNUs logo" -#: src/docs/validators.py:7 +#: src/docs/validators.py:8 msgid "Only numbers, letters, spaces, parentheses and colons are allowed." msgstr "Kun tall, bokstaver, mellomrom, parenteser og kolon er tillatt." -#: src/docs/views.py:94 +#: src/docs/views.py:120 msgid "Documentation home page" msgstr "Hjemmeside for dokumentasjon" -#: src/docs/views.py:142 +#: src/docs/views.py:180 #, python-brace-format msgid "Change “{title}”" msgstr "Endre «{title}»" -#: src/docs/views.py:148 +#: src/docs/views.py:186 #, python-brace-format msgid "View “{title}”" msgstr "Se «{title}»" -#: src/faq/admin.py:18 src/faq/models.py:28 src/faq/models.py:40 +#: src/faq/admin.py:22 src/faq/models.py:36 src/faq/models.py:48 #: src/faq/templates/faq/admin_category_list.html:6 #: src/faq/templates/faq/admin_category_list.html:19 #: src/faq/templates/faq/admin_faq_panel.html:33 msgid "categories" msgstr "kategorier" -#: src/faq/forms.py:13 +#: src/faq/forms.py:14 msgid "Choose categories" msgstr "Velg kategorier" -#: src/faq/models.py:22 src/faq/models.py:27 +#: src/faq/models.py:30 src/faq/models.py:35 msgid "category" msgstr "kategori" -#: src/faq/models.py:35 src/faq/models.py:47 +#: src/faq/models.py:43 src/faq/models.py:57 msgid "question" msgstr "spørsmål" -#: src/faq/models.py:36 +#: src/faq/models.py:44 msgid "answer" msgstr "svar" -#: src/faq/models.py:48 src/faq/templates/faq/admin_faq_panel.html:22 +#: src/faq/models.py:58 src/faq/templates/faq/admin_faq_panel.html:22 #: src/faq/templates/faq/admin_question_list.html:6 #: src/faq/templates/faq/admin_question_list.html:19 msgid "questions" @@ -656,27 +656,27 @@ msgstr "Her kan du legge til, endre og slette kategorier" msgid "Frequently Asked Questions" msgstr "Ofte stilte spørsmål" -#: src/faq/views.py:58 +#: src/faq/views.py:69 msgid "Admin page for questions" msgstr "Administrasjonsside for spørsmål" -#: src/faq/views.py:64 +#: src/faq/views.py:75 msgid "Add Question" msgstr "Legg til spørsmål" -#: src/faq/views.py:71 +#: src/faq/views.py:82 msgid "Change Question" msgstr "Endre spørsmål" -#: src/faq/views.py:86 +#: src/faq/views.py:97 msgid "Admin page for categories" msgstr "Administrasjonsside for kategorier" -#: src/faq/views.py:92 +#: src/faq/views.py:103 msgid "Add Category" msgstr "Legg til kategori" -#: src/faq/views.py:99 +#: src/faq/views.py:110 msgid "Change Category" msgstr "Endre kategori" @@ -688,28 +688,28 @@ msgstr "foreldre" msgid "own permissions" msgstr "egne rettigheter" -#: src/groups/models.py:104 +#: src/groups/models.py:106 msgid "group" msgstr "gruppe" -#: src/groups/models.py:106 src/news/models.py:41 +#: src/groups/models.py:108 src/news/models.py:45 msgid "clickbait" msgstr "lokketekst" -#: src/groups/models.py:107 src/internal/models.py:263 -#: src/make_queue/models/course.py:14 src/makerspace/models.py:24 +#: src/groups/models.py:109 src/internal/models.py:312 +#: src/make_queue/models/course.py:24 src/makerspace/models.py:26 msgid "description" msgstr "beskrivelse" -#: src/groups/models.py:108 src/internal/models.py:196 -#: src/news/admin.py:313 +#: src/groups/models.py:110 src/internal/models.py:235 +#: src/news/admin.py:429 #: src/news/templates/admin/news/event/change_form_ticket_table.html:17 -#: src/users/admin.py:36 +#: src/users/admin.py:55 msgid "email" msgstr "e-post" -#: src/groups/models.py:110 src/makerspace/admin.py:17 -#: src/makerspace/models.py:26 src/news/admin.py:39 src/news/models.py:43 +#: src/groups/models.py:116 src/makerspace/admin.py:17 +#: src/makerspace/models.py:31 src/news/admin.py:50 src/news/models.py:53 msgid "image" msgstr "bilde" @@ -738,23 +738,23 @@ msgstr "Administrasjonsside for komiteer" msgid "Change {committee}" msgstr "Endre {committee}" -#: src/internal/admin.py:21 src/make_queue/models/course.py:39 +#: src/internal/admin.py:25 src/make_queue/models/course.py:51 msgid "full name" msgstr "fullt navn" -#: src/internal/admin.py:50 src/internal/models.py:274 +#: src/internal/admin.py:52 src/internal/models.py:323 msgid "extra view permissions" msgstr "ekstra visningsrettigheter" -#: src/internal/forms.py:17 +#: src/internal/forms.py:21 msgid "Choose user" msgstr "Velg bruker" -#: src/internal/forms.py:19 src/internal/forms.py:36 +#: src/internal/forms.py:24 src/internal/forms.py:50 msgid "Choose committees" msgstr "Velg komiteer" -#: src/internal/forms.py:67 +#: src/internal/forms.py:87 msgid "" "Member was not set as retired, as the member already has the status “quit” " "or “retired”." @@ -762,7 +762,7 @@ msgstr "" "Medlemmet ble ikke markert som pang, fordi medlemmet allerede har status " "«sluttet» eller «pang»." -#: src/internal/forms.py:98 +#: src/internal/forms.py:118 msgid "" "Member was not set as quit, as the member already has the status “quit” or " "“retired”." @@ -770,7 +770,7 @@ msgstr "" "Medlemmet ble ikke markert som sluttet, fordi medlemmet allerede har status " "«sluttet» eller «pang»." -#: src/internal/forms.py:137 +#: src/internal/forms.py:157 msgid "" "Member's “quit” status was not undone, as the member did not have the status " "“quit”." @@ -778,7 +778,7 @@ msgstr "" "Medlemmets «sluttet»-status ble ikke omgjort, fordi medlemmet ikke hadde " "status «sluttet»." -#: src/internal/forms.py:142 +#: src/internal/forms.py:162 msgid "" "Member's retirement was not undone, as the member did not have the status " "“retired”." @@ -787,9 +787,9 @@ msgstr "" "«pang»." #: src/internal/models.py:31 src/make_queue/forms/quota.py:19 -#: src/make_queue/models/course.py:36 -#: src/make_queue/models/reservation.py:31 src/news/admin.py:306 -#: src/news/models.py:250 +#: src/make_queue/models/course.py:46 +#: src/make_queue/models/reservation.py:35 src/news/admin.py:422 +#: src/news/models.py:307 #: src/news/templates/admin/news/event/change_form_ticket_table.html:16 #: src/web/templates/web/header.html:90 msgid "user" @@ -812,49 +812,49 @@ msgstr "kontakt-e-post" msgid "Google email" msgstr "Google-e-post" -#: src/internal/models.py:44 +#: src/internal/models.py:46 #: src/internal/templates/internal/member_list.html:298 msgid "MAKE email" msgstr "MAKE-e-post" -#: src/internal/models.py:45 +#: src/internal/models.py:49 #: src/internal/templates/internal/member_list.html:150 #: src/internal/templates/internal/member_list.html:274 msgid "phone number" msgstr "telefonnummer" -#: src/internal/models.py:46 +#: src/internal/models.py:51 #: src/internal/templates/internal/member_list.html:312 msgid "study program" msgstr "studieprogram" -#: src/internal/models.py:47 +#: src/internal/models.py:55 #: src/internal/templates/internal/member_list.html:318 msgid "starting semester at NTNU" msgstr "startsemester på NTNU" -#: src/internal/models.py:48 +#: src/internal/models.py:56 msgid "Must be in the format [V/H][year], e.g. “V17” or “H2017”." msgstr "Må være på formatet [V/H][år], f.eks. «V17» eller «H2017»." -#: src/internal/models.py:49 +#: src/internal/models.py:59 msgid "date joined" msgstr "startdato" -#: src/internal/models.py:50 +#: src/internal/models.py:62 msgid "date quit or retired" msgstr "dato sluttet eller panget" -#: src/internal/models.py:51 +#: src/internal/models.py:64 #: src/internal/templates/internal/member_list.html:344 msgid "reason quit" msgstr "sluttårsak" -#: src/internal/models.py:52 +#: src/internal/models.py:65 #: src/internal/templates/internal/member_list.html:374 #: src/make_queue/templates/make_queue/reservation_form.html:130 #: src/make_queue/templates/make_queue/reservation_form.html:132 -#: src/news/models.py:275 +#: src/news/models.py:342 #: src/news/templates/admin/news/event/change_form_ticket_table.html:18 #: src/news/templates/email/ticket.html:50 #: src/news/templates/email/ticket.txt:8 @@ -863,97 +863,97 @@ msgstr "sluttårsak" msgid "comment" msgstr "kommentar" -#: src/internal/models.py:53 +#: src/internal/models.py:66 msgid "is active" msgstr "er aktiv" -#: src/internal/models.py:54 +#: src/internal/models.py:68 #: src/internal/templates/internal/member_list.html:368 msgid "guidance exemption" msgstr "veiledningsfritak" -#: src/internal/models.py:55 +#: src/internal/models.py:70 msgid "has quit" msgstr "har sluttet" -#: src/internal/models.py:56 +#: src/internal/models.py:71 #: src/internal/templates/internal/member_list.html:87 #: src/internal/templates/internal/member_list.html:88 #: src/internal/templatetags/member.py:24 msgid "retired" msgstr "pang" -#: src/internal/models.py:57 +#: src/internal/models.py:72 #: src/internal/templates/internal/member_list.html:90 #: src/internal/templates/internal/member_list.html:91 #: src/internal/templatetags/member.py:31 msgid "honorary" msgstr "æresmedlem" -#: src/internal/models.py:59 +#: src/internal/models.py:74 #: src/internal/templates/internal/member_list.html:388 msgid "GitHub username" msgstr "GitHub-brukernavn" -#: src/internal/models.py:60 +#: src/internal/models.py:76 #: src/internal/templates/internal/member_list.html:396 msgid "Discord username" msgstr "Discord-brukernavn" -#: src/internal/models.py:61 +#: src/internal/models.py:79 #: src/internal/templates/internal/member_list.html:402 msgid "Minecraft username" msgstr "Minecraft-brukernavn" -#: src/internal/models.py:191 +#: src/internal/models.py:230 msgid "Drive" msgstr "Drive" -#: src/internal/models.py:192 +#: src/internal/models.py:231 msgid "Slack" msgstr "Slack" -#: src/internal/models.py:193 +#: src/internal/models.py:232 #: src/make_queue/templates/make_queue/reservation_list.html:117 #: src/make_queue/templates/make_queue/reservation_list.html:197 msgid "Calendar" msgstr "Kalender" -#: src/internal/models.py:194 +#: src/internal/models.py:233 msgid "Trello" msgstr "Trello" -#: src/internal/models.py:197 +#: src/internal/models.py:236 msgid "Website" msgstr "Nettside" -#: src/internal/models.py:204 +#: src/internal/models.py:243 msgid "member" msgstr "medlem" -#: src/internal/models.py:206 +#: src/internal/models.py:246 msgid "system" msgstr "system" -#: src/internal/models.py:207 +#: src/internal/models.py:248 msgid "access" msgstr "tilgang" -#: src/internal/models.py:218 +#: src/internal/models.py:261 #, python-brace-format msgid "Access for {member} to {name}: {has_access}" msgstr "Tilgang for {member} til {name}: {has_access}" -#: src/internal/models.py:267 src/make_queue/models/machine.py:44 -#: src/make_queue/models/machine.py:149 src/makerspace/models.py:30 +#: src/internal/models.py:316 src/make_queue/models/machine.py:53 +#: src/make_queue/models/machine.py:189 src/makerspace/models.py:36 msgid "priority" msgstr "prioritet" -#: src/internal/models.py:268 +#: src/internal/models.py:317 msgid "If specified, the secrets are sorted ascending by this value." msgstr "Hvis spesifisert, sorteres hemmelighetene stigende på denne verdien." -#: src/internal/models.py:276 +#: src/internal/models.py:325 msgid "" "Extra permissions that are required for viewing the secret. If a user does " "not have all the chosen permissions, it will be hidden to them." @@ -961,36 +961,36 @@ msgstr "" "Ekstra rettigheter som kreves for å se hemmeligheten. Hvis en bruker ikke " "har alle de valgte rettighetene vil den være skjult for vedkommende." -#: src/internal/models.py:300 +#: src/internal/models.py:358 msgid "quote" msgstr "sitat" -#: src/internal/models.py:301 +#: src/internal/models.py:361 msgid "quoted" msgstr "sitert" -#: src/internal/models.py:301 +#: src/internal/models.py:362 msgid "The person who is quoted." msgstr "Personen som blir sitert." -#: src/internal/models.py:302 +#: src/internal/models.py:364 msgid "context" msgstr "kontekst" -#: src/internal/models.py:303 +#: src/internal/models.py:365 #: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:100 -#: src/make_queue/views/course.py:125 +#: src/make_queue/views/course.py:140 #: src/news/templates/news/event/event_list_contents.html:26 #: src/web/templates/web/forms/widgets/semantic_date.html:11 #: src/web/templates/web/forms/widgets/semantic_datetime.html:11 msgid "date" msgstr "dato" -#: src/internal/models.py:308 +#: src/internal/models.py:370 msgid "author" msgstr "forfatter" -#: src/internal/models.py:315 +#: src/internal/models.py:377 #, python-brace-format msgid "“{quote}” —{quoted}" msgstr "«{quote}» —{quoted}" @@ -1053,14 +1053,14 @@ msgstr "Ting som skal gjøres når et nytt medlem tas opp" #: src/internal/templates/internal/member_list.html:10 #: src/internal/templates/internal/member_list.html:44 -#: src/internal/views.py:77 src/internal/views.py:171 +#: src/internal/views.py:85 src/internal/views.py:191 msgid "Member list" msgstr "Medlemsliste" #: src/internal/templates/internal/member_list.html:17 #: src/internal/templates/internal/member_list.html:81 #: src/internal/templates/internal/member_list.html:82 -#: src/internal/templatetags/member.py:28 src/news/models.py:271 +#: src/internal/templatetags/member.py:28 src/news/models.py:330 #: src/news/templates/news/event/admin_event_ticket_list.html:50 msgid "active" msgstr "aktiv" @@ -1105,9 +1105,9 @@ msgstr "Filtrer komiteer" #: src/internal/templates/internal/member_list.html:132 #: src/internal/templates/internal/member_list.html:268 -#: src/make_queue/models/course.py:12 src/make_queue/models/machine.py:120 +#: src/make_queue/models/course.py:23 src/make_queue/models/machine.py:142 #: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:97 -#: src/make_queue/views/course.py:122 +#: src/make_queue/views/course.py:137 msgid "name" msgstr "navn" @@ -1118,7 +1118,7 @@ msgstr "komité" #: src/internal/templates/internal/member_list.html:141 #: src/internal/templates/internal/member_list.html:350 -#: src/make_queue/models/course.py:44 src/make_queue/models/machine.py:140 +#: src/make_queue/models/course.py:61 src/make_queue/models/machine.py:171 #: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:101 #: src/make_queue/templates/make_queue/machine_detail.html:100 msgid "status" @@ -1138,15 +1138,15 @@ msgid "Date quit" msgstr "Sluttdato" #: src/internal/templates/internal/member_list.html:190 -#: src/internal/templatetags/member.py:48 -#: src/make_queue/templates/make_queue/course/printer_3d_course_form.html:109 -#: src/news/admin.py:263 src/util/admin_utils.py:113 +#: src/internal/templatetags/member.py:49 +#: src/make_queue/templates/make_queue/course/printer_3d_course_form.html:108 +#: src/news/admin.py:363 src/util/admin_utils.py:135 msgid "Yes" msgstr "Ja" #: src/internal/templates/internal/member_list.html:192 -#: src/internal/templatetags/member.py:48 src/news/admin.py:265 -#: src/util/admin_utils.py:114 +#: src/internal/templatetags/member.py:49 src/news/admin.py:365 +#: src/util/admin_utils.py:136 msgid "No" msgstr "Nei" @@ -1163,12 +1163,12 @@ msgid "Basic information" msgstr "Grunnleggende informasjon" #: src/internal/templates/internal/member_list.html:326 -#: src/internal/views.py:143 +#: src/internal/views.py:159 msgid "Membership information" msgstr "Medlemskapsinformasjon" #: src/internal/templates/internal/member_list.html:382 -#: src/internal/views.py:137 +#: src/internal/views.py:151 msgid "Extra information" msgstr "Ekstrainformasjon" @@ -1232,83 +1232,87 @@ msgstr "Utsett å skjule i %(num_seconds)s sekunder" msgid "Enter a valid email address ending in “@makentnu.no”." msgstr "Oppgi en gyldig e-postadresse som slutter med «@makentnu.no»." -#: src/internal/validators.py:24 +#: src/internal/validators.py:25 msgid "Enter a valid format for a semester." msgstr "Oppgi et gyldig format for et semester." -#: src/internal/views.py:85 +#: src/internal/views.py:93 msgid "Add New Member" msgstr "Legg til nytt medlem" -#: src/internal/views.py:124 +#: src/internal/views.py:130 #, python-brace-format msgid "Change Information for {full_name}" msgstr "Endre informasjonen til {full_name}" -#: src/internal/views.py:172 +#: src/internal/views.py:192 msgid "Set retired" msgstr "Sett panget" -#: src/internal/views.py:178 +#: src/internal/views.py:198 #, python-brace-format msgid "Set member {name} as retired" msgstr "Sett medlem {name} som pang" -#: src/internal/views.py:191 +#: src/internal/views.py:213 msgid "Set quit" msgstr "Sett sluttet" -#: src/internal/views.py:197 +#: src/internal/views.py:222 #, python-brace-format msgid "Set member {name} as quit" msgstr "Sett medlem {name} som sluttet" -#: src/internal/views.py:257 +#: src/internal/views.py:287 msgid "Secrets list" msgstr "Liste med hemmeligheter" -#: src/internal/views.py:263 +#: src/internal/views.py:293 msgid "Add Secret" msgstr "Legg til hemmelighet" -#: src/internal/views.py:276 +#: src/internal/views.py:309 msgid "Change Secret" msgstr "Endre hemmelighet" -#: src/internal/views.py:299 +#: src/internal/views.py:334 msgid "Quotes page" msgstr "Sitatside" -#: src/internal/views.py:308 +#: src/internal/views.py:343 msgid "Add Quote" msgstr "Legg til sitat" -#: src/internal/views.py:317 +#: src/internal/views.py:352 msgid "Change Quote" msgstr "Endre sitat" -#: src/make_queue/admin.py:22 +#: src/make_queue/admin.py:35 #: src/make_queue/templates/make_queue/machine_list.html:7 #: src/make_queue/templates/make_queue/machine_list.html:19 #: src/make_queue/templates/make_queue/reservation_list.html:44 msgid "machines" msgstr "maskiner" -#: src/make_queue/admin.py:46 src/make_queue/models/machine.py:136 +#: src/make_queue/admin.py:75 src/make_queue/models/machine.py:158 #: src/make_queue/templates/make_queue/machine_detail.html:79 -#: src/news/admin.py:238 src/news/models.py:202 +#: src/news/admin.py:338 src/news/models.py:252 msgid "location" msgstr "sted" -#: src/make_queue/api/views.py:139 +#: src/make_queue/admin.py:143 src/make_queue/models/course.py:64 +msgid "course permissions" +msgstr "kurs tillatelser" + +#: src/make_queue/api/views.py:179 msgid "Cannot mark reservation as finished when it has not started yet." msgstr "Kan ikke sette reservasjonen som ferdig når den ikke har startet ennå." -#: src/make_queue/api/views.py:141 +#: src/make_queue/api/views.py:183 msgid "Cannot mark reservation as finished when it has already ended." msgstr "Kan ikke sette reservasjonen som ferdig når den allerede er over." -#: src/make_queue/api/views.py:165 +#: src/make_queue/api/views.py:215 msgid "" "Cannot delete reservation when it has already started. Mark it as finished " "instead." @@ -1316,19 +1320,16 @@ msgstr "" "Kan ikke slette reservasjonen når den allerede har startet. Sett den som " "ferdig istedenfor." -#: src/make_queue/api/views.py:167 +#: src/make_queue/api/views.py:218 msgid "Cannot delete reservation when it has already ended." msgstr "Kan ikke slette reservasjonen når den allerede er over." -#: src/make_queue/forms/course.py:34 src/make_queue/forms/quota.py:17 +#: src/make_queue/forms/course.py:38 src/make_queue/forms/quota.py:17 #: src/make_queue/templates/make_queue/quota/admin_quota_panel.html:70 msgid "Select user" msgstr "Velg bruker" -#. Translators: See the Norwegian and English versions of this page for -#. a translation of "Building security": -#. https://i.ntnu.no/wiki/-/wiki/Norsk/Vakt+og+service+p%C3%A5+campus -#: src/make_queue/forms/course.py:56 +#: src/make_queue/forms/course.py:66 msgid "" "The card number was detected to be the phone number of Building security at " "NTNU. Please enter a valid card number." @@ -1337,10 +1338,10 @@ msgstr "" "NTNU. Vennligst fyll inn et gyldig kortnummer." #: src/make_queue/forms/machine.py:20 src/make_queue/forms/quota.py:24 -#: src/make_queue/forms/reservation.py:66 -#: src/make_queue/models/machine.py:134 -#: src/make_queue/models/reservation.py:37 -#: src/make_queue/models/reservation.py:304 +#: src/make_queue/forms/reservation.py:71 +#: src/make_queue/models/machine.py:156 +#: src/make_queue/models/reservation.py:41 +#: src/make_queue/models/reservation.py:350 #: src/make_queue/templates/make_queue/machine_detail.html:86 msgid "machine type" msgstr "maskintype" @@ -1349,7 +1350,7 @@ msgstr "maskintype" msgid "Select machine type" msgstr "Velg maskintype" -#: src/make_queue/forms/machine.py:63 +#: src/make_queue/forms/machine.py:68 msgid "Stream name cannot be empty when the machine type supports streaming." msgstr "Videostrømnavn må oppgis når maskintypen støtter videostrømming." @@ -1365,119 +1366,131 @@ msgstr "Bruker kan ikke være satt når «Alle brukere» er satt." msgid "Must select either specific user or all users." msgstr "Må velge enten én spesifikk bruker eller alle brukere." -#: src/make_queue/forms/reservation.py:69 +#: src/make_queue/forms/reservation.py:74 msgid "Duration in hours" msgstr "Varighet i timer" -#: src/make_queue/forms/reservation.py:70 +#: src/make_queue/forms/reservation.py:76 msgid "Duration in minutes" msgstr "Varighet i minutter" -#: src/make_queue/forms/reservation_rule.py:33 +#: src/make_queue/forms/reservation_rule.py:50 msgid "" "Period is either too long (7+ days) or start time is earlier than end time." msgstr "" "Perioden er enten for lang (7+ dager) eller starttiden er før sluttiden." -#: src/make_queue/forms/reservation_rule.py:42 +#: src/make_queue/forms/reservation_rule.py:67 msgid "Rule has internal overlap of time periods." msgstr "Tidsperiodene innad i regelen overlapper hverandre." -#: src/make_queue/forms/reservation_rule.py:52 +#: src/make_queue/forms/reservation_rule.py:82 msgid "Rule time periods overlap with time periods of other rules." msgstr "" "Tidsperiodene til regelen overlapper med tidsperiodene til andre regler." -#: src/make_queue/models/course.py:13 +#: src/make_queue/models/course.py:15 +msgid "Only has to be logged in" +msgstr "Trenger bare å være innlogget" + +#: src/make_queue/models/course.py:16 +msgid "Taken the 3D printer course" +msgstr "Tatt 3D-printerkurset" + +#: src/make_queue/models/course.py:17 +msgid "Taken the course on Raise3D printers" +msgstr "Tatt Raise3D-printerkurset" + +#: src/make_queue/models/course.py:18 +msgid "Taken the SLA 3D printer course" +msgstr "Tatt SLA 3D-printerkurset" + +#: src/make_queue/models/course.py:21 msgid "short name" msgstr "kort navn" -#: src/make_queue/models/course.py:24 +#: src/make_queue/models/course.py:34 msgid "Registered" msgstr "Registrert" #. Translators: See the Norwegian and English versions of this page for #. a translation of "Building security": #. https://i.ntnu.no/wiki/-/wiki/Norsk/Vakt+og+service+p%C3%A5+campus -#: src/make_queue/models/course.py:28 +#: src/make_queue/models/course.py:38 msgid "Sent to Building security" msgstr "Sendt til Vakt og service" -#: src/make_queue/models/course.py:29 +#: src/make_queue/models/course.py:39 msgid "Access granted" msgstr "Tilgang gitt" -#: src/make_queue/models/course.py:38 +#: src/make_queue/models/course.py:49 #: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:98 -#: src/make_queue/views/course.py:123 +#: src/make_queue/views/course.py:138 msgid "username" msgstr "brukernavn" -#: src/make_queue/models/course.py:43 +#: src/make_queue/models/course.py:56 msgid "course date" msgstr "kursdato" -#: src/make_queue/models/course.py:45 -msgid "course permissions" -msgstr "kurs tillatelser" - -#: src/make_queue/models/course.py:52 +#: src/make_queue/models/course.py:75 msgid "3D printer course" msgstr "3D-printerkurs" -#: src/make_queue/models/course.py:53 +#: src/make_queue/models/course.py:76 msgid "3D printer courses" msgstr "3D-printerkurs" -#: src/make_queue/models/machine.py:41 +#: src/make_queue/models/machine.py:48 msgid "usage requirement" msgstr "brukskrav" -#: src/make_queue/models/machine.py:45 +#: src/make_queue/models/machine.py:54 msgid "The machine types are sorted ascending by this value." msgstr "Maskintypene sorteres stigende på denne verdien." -#: src/make_queue/models/machine.py:112 +#: src/make_queue/models/machine.py:134 msgid "Reserved" msgstr "Reservert" -#: src/make_queue/models/machine.py:113 +#: src/make_queue/models/machine.py:135 msgid "Available" msgstr "Ledig" -#: src/make_queue/models/machine.py:114 +#: src/make_queue/models/machine.py:136 msgid "In use" msgstr "I bruk" -#: src/make_queue/models/machine.py:115 +#: src/make_queue/models/machine.py:137 msgid "Out of order" msgstr "I ustand" -#: src/make_queue/models/machine.py:116 +#: src/make_queue/models/machine.py:138 msgid "Maintenance" msgstr "Vedlikehold" -#: src/make_queue/models/machine.py:126 +#: src/make_queue/models/machine.py:148 msgid "stream name" msgstr "videostrømnavn" -#: src/make_queue/models/machine.py:127 +#: src/make_queue/models/machine.py:149 msgid "Used for connecting to the machine's stream." msgstr "Brukes til å koble til maskinens videostrøm." -#: src/make_queue/models/machine.py:129 +#: src/make_queue/models/machine.py:151 msgid "machine model" msgstr "maskinmodell" -#: src/make_queue/models/machine.py:137 src/news/models.py:203 +#: src/make_queue/models/machine.py:159 src/news/models.py:253 msgid "location URL" msgstr "sted-URL" -#: src/make_queue/models/machine.py:138 src/news/models.py:50 +#: src/make_queue/models/machine.py:162 src/news/models.py:65 msgid "internal" msgstr "internt" -#: src/make_queue/models/machine.py:139 +#: src/make_queue/models/machine.py:164 msgid "" "If selected, the machine will only be visible to and reservable by MAKE " "members." @@ -1485,12 +1498,12 @@ msgstr "" "Hvis valgt vil maskinen bare være synlig og mulig å reservere for MAKE-" "medlemmer." -#: src/make_queue/models/machine.py:141 +#: src/make_queue/models/machine.py:175 #: src/make_queue/templates/make_queue/machine_detail.html:115 msgid "info message" msgstr "infomelding" -#: src/make_queue/models/machine.py:142 +#: src/make_queue/models/machine.py:177 msgid "" "Information that's useful to know before using the machine, e.g. the " "filament that the 3D printer uses, the needle that's currently inserted in " @@ -1501,129 +1514,129 @@ msgstr "" "som 3D-printeren bruker, nåla som er satt i symaskinen, eller " "tilstanden/«humøret» til maskinen for tida (emoji-er er tillatt 🤠)." -#: src/make_queue/models/machine.py:145 +#: src/make_queue/models/machine.py:184 msgid "time the info message was changed" msgstr "tidspunkt infomeldingen ble endra" -#: src/make_queue/models/machine.py:150 +#: src/make_queue/models/machine.py:190 msgid "If specified, the machines are sorted ascending by this value." msgstr "Hvis spesifisert, sorteres maskinene stigende på denne verdien." -#: src/make_queue/models/machine.py:152 +#: src/make_queue/models/machine.py:194 msgid "notes" msgstr "notater" -#: src/make_queue/models/machine.py:152 +#: src/make_queue/models/machine.py:195 msgid "This is only for internal use and is not displayed anywhere." msgstr "Dette er bare for intern bruk og blir ikke vist fram noe sted." -#: src/make_queue/models/machine.py:212 src/make_queue/views/machine.py:52 +#: src/make_queue/models/machine.py:276 src/make_queue/views/machine.py:68 #, python-brace-format msgid "Usage rules for {machine_type}" msgstr "Bruksregler for {machine_type}" -#: src/make_queue/models/reservation.py:24 +#: src/make_queue/models/reservation.py:28 msgid "all users" msgstr "alle brukere" -#: src/make_queue/models/reservation.py:39 +#: src/make_queue/models/reservation.py:44 msgid "number of reservations" msgstr "antall reservasjoner" -#: src/make_queue/models/reservation.py:40 +#: src/make_queue/models/reservation.py:46 msgid "diminishing" msgstr "oppbrukbar" -#: src/make_queue/models/reservation.py:41 +#: src/make_queue/models/reservation.py:47 #: src/make_queue/templates/make_queue/quota/admin_quota_panel.html:60 #: src/make_queue/templates/make_queue/quota/admin_user_quota_list.html:29 #: src/make_queue/templates/make_queue/reservation_rule_list.html:120 msgid "ignores rules" msgstr "ignorerer regler" -#: src/make_queue/models/reservation.py:47 +#: src/make_queue/models/reservation.py:53 msgid "quota" msgstr "kvote" -#: src/make_queue/models/reservation.py:48 +#: src/make_queue/models/reservation.py:54 #: src/make_queue/templates/make_queue/quota/admin_quota_panel.html:6 #: src/make_queue/templates/make_queue/quota/admin_quota_panel.html:22 #: src/web/templates/web/admin_panel.html:53 msgid "quotas" msgstr "kvoter" -#: src/make_queue/models/reservation.py:52 +#: src/make_queue/models/reservation.py:58 msgid "" msgstr "" -#: src/make_queue/models/reservation.py:54 +#: src/make_queue/models/reservation.py:60 msgid "" msgstr "" -#: src/make_queue/models/reservation.py:55 +#: src/make_queue/models/reservation.py:61 #, python-brace-format msgid "Quota for {user} on {machine_type}" msgstr "Kvote for {user} på {machine_type}" -#: src/make_queue/models/reservation.py:290 +#: src/make_queue/models/reservation.py:336 msgid "Monday" msgstr "Mandag" -#: src/make_queue/models/reservation.py:291 +#: src/make_queue/models/reservation.py:337 msgid "Tuesday" msgstr "Tirsdag" -#: src/make_queue/models/reservation.py:292 +#: src/make_queue/models/reservation.py:338 msgid "Wednesday" msgstr "Onsdag" -#: src/make_queue/models/reservation.py:293 +#: src/make_queue/models/reservation.py:339 msgid "Thursday" msgstr "Torsdag" -#: src/make_queue/models/reservation.py:294 +#: src/make_queue/models/reservation.py:340 msgid "Friday" msgstr "Fredag" -#: src/make_queue/models/reservation.py:295 +#: src/make_queue/models/reservation.py:341 msgid "Saturday" msgstr "Lørdag" -#: src/make_queue/models/reservation.py:296 +#: src/make_queue/models/reservation.py:342 msgid "Sunday" msgstr "Søndag" -#: src/make_queue/models/reservation.py:306 +#: src/make_queue/models/reservation.py:352 #: src/make_queue/templates/make_queue/reservation_form.html:99 #: src/make_queue/templates/make_queue/reservation_form.html:103 -#: src/news/models.py:200 +#: src/news/models.py:247 msgid "start time" msgstr "starttidspunkt" -#: src/make_queue/models/reservation.py:307 +#: src/make_queue/models/reservation.py:353 #: src/make_queue/templates/make_queue/reservation_form.html:114 #: src/make_queue/templates/make_queue/reservation_form.html:118 -#: src/news/models.py:201 +#: src/news/models.py:250 msgid "end time" msgstr "sluttidspunkt" -#: src/make_queue/models/reservation.py:308 +#: src/make_queue/models/reservation.py:355 msgid "days" msgstr "dager" -#: src/make_queue/models/reservation.py:308 +#: src/make_queue/models/reservation.py:356 msgid "Number of times midnight is passed between start and end time." msgstr "Antall ganger midnatt passeres mellom start- og sluttid." -#: src/make_queue/models/reservation.py:310 +#: src/make_queue/models/reservation.py:363 msgid "start days for rule periods" msgstr "startdager for regelperioder" -#: src/make_queue/models/reservation.py:311 +#: src/make_queue/models/reservation.py:365 msgid "hours single period" msgstr "timer enkeltperiode" -#: src/make_queue/models/reservation.py:312 +#: src/make_queue/models/reservation.py:366 msgid "hours multi-period" msgstr "timer fler-periode" @@ -1702,14 +1715,14 @@ msgstr "Nullstill valg" msgid "Registration status" msgstr "Registreringsstatus" -#: src/make_queue/templates/make_queue/course/printer_3d_course_form.html:122 +#: src/make_queue/templates/make_queue/course/printer_3d_course_form.html:116 #: src/make_queue/templates/make_queue/reservation_form.html:188 -#: src/util/view_utils.py:115 +#: src/util/view_utils.py:117 msgid "Save" msgstr "Lagre" -#: src/make_queue/templates/make_queue/course/printer_3d_course_form.html:126 -#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:211 +#: src/make_queue/templates/make_queue/course/printer_3d_course_form.html:120 +#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:209 #: src/make_queue/templates/make_queue/reservation_form.html:190 #: src/news/templates/news/event/ticket/event_ticket_cancel.html:17 #: src/web/templates/web/delete_modal.html:22 @@ -1774,27 +1787,27 @@ msgstr "Er du sikker på at du vil slette kursregistreringen til %(user)s?" msgid "Connected to user" msgstr "Koblet til bruker" -#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:178 +#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:176 msgid "Filter matches" msgstr "Filter matcher" -#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:182 +#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:180 msgid "registrations" msgstr "registreringer" -#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:192 +#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:190 msgid "Set status of users to" msgstr "Sett status for brukere til" -#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:201 +#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:199 msgid "You are changing the status for the following users" msgstr "Du vil endre status for følgende brukere" -#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:203 +#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:201 msgid "Are you sure you want to do this?" msgstr "Er du sikker på at du vil gjøre dette?" -#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:208 +#: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:206 msgid "Set status" msgstr "Sett status" @@ -1810,7 +1823,7 @@ msgid "View in calendar" msgstr "Se i kalender" #: src/make_queue/templates/make_queue/machine_detail.html:66 -#: src/make_queue/templates/make_queue/machine_list.html:43 +#: src/make_queue/templates/make_queue/machine_list.html:50 msgid "Show rules" msgstr "Vis regler" @@ -1828,6 +1841,10 @@ msgstr "modell" msgid "Find free reservation slots" msgstr "Finn ledige reservasjonstidspunkter" +#: src/make_queue/templates/make_queue/machine_list.html:35 +msgid "Shortcuts:" +msgstr "Snarveier:" + #: src/make_queue/templates/make_queue/machine_usage_rule_detail.html:18 msgid "Quotas and detailed rules for reservation duration" msgstr "Kvoter og detaljerte regler rundt reservasjonstid" @@ -1917,7 +1934,7 @@ msgid "Select equipment type" msgstr "Velg utstyrstype" #: src/make_queue/templates/make_queue/reservation_form.html:78 -#: src/makerspace/models.py:39 src/makerspace/models.py:40 +#: src/makerspace/models.py:45 src/makerspace/models.py:46 #: src/makerspace/templates/makerspace/equipment/admin_equipment_list.html:6 #: src/makerspace/templates/makerspace/equipment/admin_equipment_list.html:14 #: src/makerspace/templates/makerspace/makerspace.html:17 @@ -1932,7 +1949,7 @@ msgstr "Velg maskin" #: src/make_queue/templates/make_queue/reservation_form.html:143 #: src/make_queue/templates/make_queue/reservation_form.html:156 -#: src/news/admin.py:231 src/news/admin.py:327 src/news/models.py:268 +#: src/news/admin.py:331 src/news/admin.py:443 src/news/models.py:325 msgid "event" msgstr "arrangement" @@ -2087,95 +2104,95 @@ msgstr "Lør" msgid "Sun" msgstr "Søn" -#: src/make_queue/templatetags/reservation_extra.py:73 +#: src/make_queue/templatetags/reservation_extra.py:75 #, python-brace-format msgid "{machine_status} for {duration}" msgstr "{machine_status} i {duration}" -#: src/make_queue/templatetags/reservation_extra.py:83 +#: src/make_queue/templatetags/reservation_extra.py:85 msgid "You must be logged in to create reservations." msgstr "Du må være logget inn for å kunne lage reservasjoner." -#: src/make_queue/templatetags/reservation_extra.py:88 +#: src/make_queue/templatetags/reservation_extra.py:90 #, python-brace-format msgid "The machine has status “{status}”." msgstr "Maskinen har status «{status}»." -#: src/make_queue/templatetags/reservation_extra.py:90 +#: src/make_queue/templatetags/reservation_extra.py:92 msgid "You have reached the maximum number of future reservations." msgstr "Du har nådd maksimalt antall framtidige reservasjoner." -#: src/make_queue/views/course.py:39 +#: src/make_queue/views/course.py:43 msgid "Registration of course participation successful" msgstr "Registrering av kursdeltakelse vellykket" -#: src/make_queue/views/course.py:92 src/make_queue/views/course.py:140 +#: src/make_queue/views/course.py:103 src/make_queue/views/course.py:163 msgid "Course participants" msgstr "Kursdeltakere" -#: src/make_queue/views/machine.py:69 +#: src/make_queue/views/machine.py:93 #, python-brace-format msgid "Change Usage Rules for {machine_type}" msgstr "Endre bruksregler for {machine_type}" -#: src/make_queue/views/machine.py:75 +#: src/make_queue/views/machine.py:101 #, python-brace-format msgid "View usage rules for {machine_type}" msgstr "Se bruksregler for {machine_type}" -#: src/make_queue/views/machine.py:153 +#: src/make_queue/views/machine.py:192 msgid "Machine list" msgstr "Maskinliste" -#: src/make_queue/views/machine.py:177 +#: src/make_queue/views/machine.py:227 msgid "Add Machine" msgstr "Legg til maskin" -#: src/make_queue/views/machine.py:187 +#: src/make_queue/views/machine.py:237 msgid "Change Machine" msgstr "Endre maskin" -#: src/make_queue/views/quota.py:74 src/make_queue/views/quota.py:101 +#: src/make_queue/views/quota.py:98 src/make_queue/views/quota.py:125 msgid "Admin page for quotas" msgstr "Administrasjonsside for kvoter" -#: src/make_queue/views/quota.py:87 +#: src/make_queue/views/quota.py:111 msgid "Add Quota" msgstr "Legg til kvote" -#: src/make_queue/views/quota.py:94 +#: src/make_queue/views/quota.py:118 msgid "Change Quota" msgstr "Endre kvote" -#: src/make_queue/views/quota.py:103 +#: src/make_queue/views/quota.py:127 #, python-brace-format msgid "Admin page for the quotas of {user_full_name}" msgstr "Administrasjonsside for kvotene til {user_full_name}" -#: src/make_queue/views/reservation.py:45 +#: src/make_queue/views/reservation.py:55 #, python-brace-format msgid "Reservations can only be made {num_days} day ahead of time" msgid_plural "Reservations can only be made {num_days} days ahead of time" msgstr[0] "Reservasjoner kan bare lages {num_days} dag fram i tid" msgstr[1] "Reservasjoner kan bare lages {num_days} dager fram i tid" -#: src/make_queue/views/reservation.py:50 +#: src/make_queue/views/reservation.py:63 msgid "The time slot or event is no longer available" msgstr "Tidspunktet eller arrangementet er ikke lenger tilgjengelig" -#: src/make_queue/views/reservation.py:52 +#: src/make_queue/views/reservation.py:65 msgid "The machine is out of order" msgstr "Maskinen er i ustand" -#: src/make_queue/views/reservation.py:54 +#: src/make_queue/views/reservation.py:67 msgid "The machine is under maintenance" msgstr "Maskinen er under vedlikehold" -#: src/make_queue/views/reservation.py:56 +#: src/make_queue/views/reservation.py:69 msgid "The reservation cannot start and end at the same time" msgstr "Reservasjonen kan ikke starte og slutte på samme tidspunkt" -#: src/make_queue/views/reservation.py:59 +#: src/make_queue/views/reservation.py:76 msgid "" "It is not possible to reserve the machine during these hours. Check the " "rules for when the machine is reservable" @@ -2183,49 +2200,49 @@ msgstr "" "Det er ikke mulig å reservere maskinen på dette tidspunktet. Sjekk reglene " "for hvilke perioder det er mulig å reservere maskinen i" -#: src/make_queue/views/reservation.py:61 +#: src/make_queue/views/reservation.py:79 msgid "The reservation exceeds your quota" msgstr "Reservasjonen går over kvoten din" -#: src/make_queue/views/reservation.py:63 +#: src/make_queue/views/reservation.py:81 msgid "The start time can't be after the end time" msgstr "Starttiden kan ikke være etter sluttiden" -#: src/make_queue/views/reservation.py:65 +#: src/make_queue/views/reservation.py:83 msgid "The reservation can't start in the past" msgstr "Reservasjonen kan ikke starte i fortiden" -#: src/make_queue/views/reservation.py:66 +#: src/make_queue/views/reservation.py:84 msgid "The time slot is not available" msgstr "Tidspunktet er ikke tilgjengelig" -#: src/make_queue/views/reservation_rule.py:28 -#: src/make_queue/views/reservation_rule.py:65 +#: src/make_queue/views/reservation_rule.py:33 +#: src/make_queue/views/reservation_rule.py:81 #, python-brace-format msgid "Reservation rules for {machine_type}" msgstr "Reservasjonsregler for {machine_type}" -#: src/make_queue/views/reservation_rule.py:77 +#: src/make_queue/views/reservation_rule.py:97 #, python-brace-format msgid "Add Rule for {machine_type}" msgstr "Legg til regel for {machine_type}" -#: src/make_queue/views/reservation_rule.py:85 +#: src/make_queue/views/reservation_rule.py:107 #, python-brace-format msgid "Change Rule for {machine_type}" msgstr "Endre regel for {machine_type}" -#: src/makerspace/admin.py:21 +#: src/makerspace/admin.py:22 #, python-brace-format msgid "Image of {equipment}." msgstr "Bilde av {equipment}." -#: src/makerspace/models.py:31 +#: src/makerspace/models.py:37 msgid "If specified, the equipment is sorted ascending by this value." msgstr "Hvis spesifisert, sorteres utstyret stigende på denne verdien." #: src/makerspace/templates/makerspace/equipment/admin_equipment_list.html:15 -#: src/makerspace/views.py:57 +#: src/makerspace/views.py:63 msgid "Add equipment" msgstr "Legg til utstyr" @@ -2263,129 +2280,125 @@ msgstr "Regler" msgid "you must follow these to be allowed to use the workshop" msgstr "du må følge disse for å få tillatelse til å bruke verkstedet" -#: src/makerspace/views.py:48 +#: src/makerspace/views.py:54 msgid "Admin page for equipment" msgstr "Administrasjonsside for utstyr" -#: src/makerspace/views.py:63 +#: src/makerspace/views.py:69 msgid "Change Equipment" msgstr "Endre utstyr" -#: src/news/admin.py:87 src/news/admin.py:144 src/news/admin.py:245 +#: src/news/admin.py:107 src/news/admin.py:197 src/news/admin.py:345 msgid "number of reserved tickets" msgstr "antall reserverte billetter" -#: src/news/admin.py:113 src/news/admin.py:221 +#: src/news/admin.py:156 src/news/admin.py:319 #: src/news/templates/news/event/admin_event_detail.html:72 #: src/news/templates/news/event/admin_event_ticket_list.html:36 msgid "tickets" msgstr "billetter" -#: src/news/admin.py:122 +#: src/news/admin.py:171 msgid "number of occurrences" msgstr "antall forekomster" -#: src/news/admin.py:127 +#: src/news/admin.py:176 msgid "future occurrences" msgstr "framtidige forekomster" -#: src/news/admin.py:135 +#: src/news/admin.py:186 msgid "previous occurrence" msgstr "forrige forekomst" -#: src/news/admin.py:159 +#: src/news/admin.py:217 #, python-brace-format msgid "{count} more..." msgstr "{count} fler..." -#: src/news/admin.py:163 src/news/admin.py:268 +#: src/news/admin.py:225 src/news/admin.py:368 msgid "active tickets" msgstr "aktive billetter" -#: src/news/admin.py:167 src/news/admin.py:272 +#: src/news/admin.py:229 src/news/admin.py:372 msgid "inactive tickets" msgstr "inaktive billetter" -#: src/news/admin.py:203 src/news/admin.py:254 +#: src/news/admin.py:286 src/news/admin.py:354 msgid "is published" msgstr "er publisert" -#: src/news/admin.py:249 +#: src/news/admin.py:349 msgid "event is standalone" msgstr "arrangementet er frittstående" -#: src/news/admin.py:257 +#: src/news/admin.py:357 msgid "event hidden" msgstr "arrangement skjult" -#: src/news/admin.py:259 src/news/models.py:49 src/news/models.py:204 +#: src/news/admin.py:359 src/news/models.py:64 src/news/models.py:256 #: src/news/templates/news/article/admin_article_list.html:39 #: src/news/templates/news/event/admin_event_list.html:50 #: src/news/templates/news/event/admin_time_place_listing.html:29 msgid "hidden" msgstr "skjult" -#: src/news/admin.py:261 +#: src/news/admin.py:361 msgid "future publication time" msgstr "framtidig publiseringstid" -#: src/news/admin.py:320 src/news/models.py:260 +#: src/news/admin.py:436 src/news/models.py:317 msgid "timeplace" msgstr "tidspunkt" -#: src/news/forms.py:31 +#: src/news/forms.py:36 msgid "The event cannot end before it starts." msgstr "Arrangementet kan ikke slutte før det starter." -#: src/news/forms.py:54 +#: src/news/forms.py:61 msgid "the article" msgstr "artikkelen" -#: src/news/forms.py:55 +#: src/news/forms.py:62 msgid "The main content of the article." msgstr "Brødteksten til artikkelen." -#: src/news/forms.py:57 +#: src/news/forms.py:64 msgid "the event" msgstr "arrangementet" -#: src/news/forms.py:58 +#: src/news/forms.py:65 msgid "The main description of the event." msgstr "Brødteksten til arrangementet." -#. Translators: `the_type` is either "the article" or "the event" -#: src/news/forms.py:62 +#: src/news/forms.py:70 #, python-brace-format msgid "A short text designed to bait users into clicking {the_type}." msgstr "En kort tekst for å lokke brukerne til å klikke på {the_type}." -#. Translators: `the_type` is either "the article" or "the event" -#: src/news/forms.py:64 +#: src/news/forms.py:74 #, python-brace-format msgid "If selected, {the_type} may be shown on the front page." msgstr "Hvis valgt kan {the_type} bli vist på forsiden." -#. Translators: `the_type` is either "the article" or "the event" -#: src/news/forms.py:66 +#: src/news/forms.py:78 #, python-brace-format msgid "If selected, {the_type} will be hidden for all users." msgstr "Hvis valgt vil {the_type} være skjult for alle brukere." -#. Translators: `the_type` is either "the article" or "the event" -#: src/news/forms.py:68 +#: src/news/forms.py:82 #, python-brace-format msgid "If selected, {the_type} will only be visible to members of MAKE NTNU." msgstr "Hvis valgt vil {the_type} bare vises for medlemmer av MAKE NTNU." -#: src/news/forms.py:92 +#: src/news/forms.py:107 msgid "Search for users" msgstr "Søk etter brukere" -#: src/news/forms.py:93 +#: src/news/forms.py:108 msgid "You can search for users' name, username and email." msgstr "Du kan søke etter brukeres navn, brukernavn og e-post." -#: src/news/forms.py:106 +#: src/news/forms.py:123 msgid "" "Here you can enter any requests or information you want to provide to the " "organizers." @@ -2393,11 +2406,11 @@ msgstr "" "Her kan du fylle inn eventuelle forespørsler eller opplysninger du ønsker å " "gi til arrangørene." -#: src/news/models.py:44 +#: src/news/models.py:56 msgid "image description" msgstr "bildebeskrivelse" -#: src/news/models.py:45 +#: src/news/models.py:58 msgid "" "This should be a concise visual description of the image, which is mainly " "useful for people using a screen reader." @@ -2405,70 +2418,70 @@ msgstr "" "Dette burde være en konsis visuell beskrivelse av bildet, som er " "hovedsakelig nyttig for folk som bruker en skjermleser." -#: src/news/models.py:47 +#: src/news/models.py:62 msgid "don't crop the image" msgstr "ikke crop bildet" -#: src/news/models.py:48 +#: src/news/models.py:63 #: src/news/templates/news/article/admin_article_list.html:33 #: src/news/templates/news/event/admin_event_list.html:44 msgid "featured" msgstr "fremhevet" -#: src/news/models.py:70 src/news/models.py:198 +#: src/news/models.py:92 src/news/models.py:243 msgid "publication time" msgstr "publiseringstid" -#: src/news/models.py:71 +#: src/news/models.py:93 msgid "The article will be hidden until this date." msgstr "Artikkelen vil være skjult fram til publiseringstidspunktet." -#: src/news/models.py:111 +#: src/news/models.py:142 msgid "Standard (repeating)" msgstr "Standard (gjentagende)" -#: src/news/models.py:112 +#: src/news/models.py:143 msgid "Multipart (standalone)" msgstr "Flerdagers (frittstående)" -#: src/news/models.py:118 +#: src/news/models.py:149 msgid "type of event" msgstr "arrangementstype" -#: src/news/models.py:120 src/news/models.py:206 +#: src/news/models.py:152 src/news/models.py:262 msgid "number of available tickets" msgstr "antall tilgjengelige billetter" -#: src/news/models.py:199 +#: src/news/models.py:244 msgid "The occurrence will not be shown before this date." msgstr "Forekomsten vil ikke vises før publiseringstidspunktet." -#: src/news/models.py:205 +#: src/news/models.py:258 msgid "" "If selected, the occurrence will be hidden, even after the publication date." msgstr "Hvis valgt vil forekomsten være skjult, selv etter publikasjonsdatoen." -#: src/news/models.py:242 src/util/templatetags/language_tags.py:19 +#: src/news/models.py:299 src/util/templatetags/language_tags.py:19 msgid "English" msgstr "Engelsk" -#: src/news/models.py:243 src/util/templatetags/language_tags.py:18 +#: src/news/models.py:300 src/util/templatetags/language_tags.py:18 msgid "Norwegian" msgstr "Norsk" -#: src/news/models.py:270 +#: src/news/models.py:328 #: src/news/templates/admin/news/event/change_form_ticket_table.html:21 #: src/news/templates/news/event/admin_event_ticket_list.html:64 #: src/news/templates/news/event/ticket/event_ticket_card.html:38 msgid "original registration date" msgstr "opprinnelig påmeldingsdato" -#: src/news/models.py:272 +#: src/news/models.py:334 #: src/news/templates/admin/news/event/change_form_ticket_table.html:20 msgid "last reactivated/canceled" msgstr "sist reaktivert/avbestilt" -#: src/news/models.py:274 +#: src/news/models.py:340 #: src/news/templates/admin/news/event/change_form_ticket_table.html:19 #: src/news/templates/email/ticket.html:47 #: src/news/templates/email/ticket.txt:7 @@ -2556,7 +2569,7 @@ msgstr "intern" #: src/news/templates/news/event/admin_event_detail.html:24 #: src/news/templates/news/event/admin_event_participants_search.html:22 -#: src/news/views/event.py:236 +#: src/news/views/event.py:316 msgid "Admin page for events" msgstr "Administrasjonsside for arrangementer" @@ -2863,65 +2876,65 @@ msgstr "Mine billetter" msgid "Preferred format is" msgstr "Foretrukket format er" -#: src/news/views/article.py:57 src/news/views/event.py:303 +#: src/news/views/article.py:71 src/news/views/event.py:394 msgid "Attributes" msgstr "Egenskaper" -#: src/news/views/article.py:72 +#: src/news/views/article.py:89 msgid "Admin page for articles" msgstr "Administrasjonsside for artikler" -#: src/news/views/article.py:81 +#: src/news/views/article.py:98 msgid "Change Article" msgstr "Endre artikkel" -#: src/news/views/article.py:87 +#: src/news/views/article.py:104 msgid "Add Article" msgstr "Legg til artikkel" -#: src/news/views/event.py:133 +#: src/news/views/event.py:183 msgid "Find events users have attended or are registered for" msgstr "Finn arrangementer brukere har eller skal delta på" -#: src/news/views/event.py:226 +#: src/news/views/event.py:306 msgid "Change Event" msgstr "Endre arrangement" -#: src/news/views/event.py:229 src/news/views/event.py:295 +#: src/news/views/event.py:309 src/news/views/event.py:379 #, python-brace-format msgid "Admin page for “{event_title}”" msgstr "Administrasjonsside for «{event_title}»" -#: src/news/views/event.py:235 +#: src/news/views/event.py:315 msgid "Add Event" msgstr "Legg til arrangement" -#: src/news/views/event.py:318 +#: src/news/views/event.py:411 #, python-brace-format msgid "Change Occurrence of “{title}”" msgstr "Endre forekomst av «{title}»" -#: src/news/views/event.py:327 +#: src/news/views/event.py:420 #, python-brace-format msgid "Add Occurrence of “{title}”" msgstr "Legg til forekomst av «{title}»" -#: src/news/views/event.py:454 +#: src/news/views/event.py:580 #, python-brace-format msgid "Your ticket for “{title}”!" msgstr "Din billett til «{title}»!" -#: src/news/views/event.py:476 +#: src/news/views/event.py:609 #, python-brace-format msgid "Register for the event “{title}”" msgstr "Meld deg på arrangementet «{title}»" -#: src/news/views/event.py:595 +#: src/news/views/event.py:737 #, python-brace-format msgid "at {time}" msgstr "den {time}" -#: src/news/views/event.py:598 +#: src/news/views/event.py:743 #, python-brace-format msgid "" "Are you sure you want to cancel your ticket for
«{event}»{at_time_string}?" -#: src/users/admin.py:25 +#: src/users/admin.py:33 msgid "personal info" msgstr "personlig informasjon" -#: src/users/admin.py:26 +#: src/users/admin.py:36 msgid "other info" msgstr "annen informasjon" -#: src/users/admin.py:27 +#: src/users/admin.py:38 msgid "permissions" msgstr "rettigheter" -#: src/users/admin.py:30 +#: src/users/admin.py:49 msgid "important dates" msgstr "viktige datoer" -#: src/users/models.py:14 +#: src/users/models.py:15 msgid "full name from LDAP" msgstr "fullt navn fra LDAP" @@ -2992,7 +3005,7 @@ msgid_plural "%(num)d minutes" msgstr[0] "%(num)d minutt" msgstr[1] "%(num)d minutter" -#: src/util/validators.py:10 +#: src/util/validators.py:11 msgid "" "This can only consist of lowercase English letters, numbers, hyphens or " "underscores." @@ -3000,11 +3013,11 @@ msgstr "" "Dette kan bare bestå av små, engelske bokstaver, tall, bindestreker og " "understreker." -#: src/web/multilingual/formfields.py:19 +#: src/web/multilingual/formfields.py:20 msgid "One or more languages have no content." msgstr "Ett eller flere språk mangler innhold." -#: src/web/settings.py:306 +#: src/web/settings.py:293 msgid "" "Determines whether the “Apply to MAKE” button in the navigation menu in the " "header is visible." @@ -3012,23 +3025,23 @@ msgstr "" "Bestemmer om «Søk verv»-knappen skal være synlig i navigasjonsmenyen i " "toppteksten." -#: src/web/settings.py:310 +#: src/web/settings.py:298 msgid "Link to the guide on what should be done when a new member enrolls." msgstr "Lenke til guiden med ting som skal gjøres når et nytt medlem tas opp." -#: src/web/settings.py:315 +#: src/web/settings.py:303 msgid "Link to the guide on what should be done when a member retires." msgstr "Lenke til guiden med ting som skal gjøres når et medlem panger." -#: src/web/settings.py:320 +#: src/web/settings.py:308 msgid "Link to the guide on what should be done when a member quits." msgstr "Lenke til guiden med ting som skal gjøres når et medlem slutter." -#: src/web/settings.py:326 +#: src/web/settings.py:314 msgid "Main Site Settings" msgstr "Hovedsideinnstillinger" -#: src/web/settings.py:329 +#: src/web/settings.py:318 msgid "Internal Site Settings" msgstr "Internsideinnstillinger" @@ -3234,54 +3247,10 @@ msgstr "Profil" msgid "Front page" msgstr "Forside" -#: src/web/widgets.py:89 src/web/widgets.py:106 +#: src/web/widgets.py:101 src/web/widgets.py:118 msgid "Choose value" msgstr "Velg verdi" -#: src/web/widgets.py:194 +#: src/web/widgets.py:227 msgid "Search places" msgstr "Søk etter steder" - -#~ msgid "You have completed the Raise3D printer course" -#~ msgstr "Du har fullført Raise3D-printerkurset" - -#~ msgid "You have not taken the Raise3D printer course" -#~ msgstr "Du har ikke tatt Raise3D-printerkurset" - -#~ msgid "" -#~ "To use a Raise3D printer, make a reservation in the calendar of one of " -#~ "the Raise3D printers on the “Reservations” page." -#~ msgstr "" -#~ "For å bruke en Raise3D-printer, lag en reservasjon i kalenderen til en av " -#~ "Raise3D-printerne på «Reservasjoner»-siden." - -#~ msgid "You have completed the SLA 3D printer course" -#~ msgstr "Du har fullført SLA 3D-printerkurset" - -#~ msgid "You have not taken the SLA 3D printer course" -#~ msgstr "Du har ikke tatt SLA 3D-printerkurset" - -#~ msgid "" -#~ "To use an SLA 3D printer, make a reservation in the calendar of one of " -#~ "the SLA 3D printers on the “Reservations” page." -#~ msgstr "" -#~ "For å bruke en SLA 3D-printer, lag en reservasjon i kalenderen til en av " -#~ "SLA 3D-printerne på «Reservasjoner»-siden." - -#~ msgid "Raise3D course" -#~ msgstr "Raise3D-kurs" - -#~ msgid "SLA course" -#~ msgstr "SLA-kurs" - -#~ msgid "Only has to be logged in" -#~ msgstr "Trenger bare å være innlogget" - -#~ msgid "Taken the 3D printer course" -#~ msgstr "Tatt 3D-printerkurset" - -#~ msgid "Taken the course on Raise3D printers" -#~ msgstr "Tatt Raise3D-printerkurset" - -#~ msgid "Taken the SLA 3D printer course" -#~ msgstr "Tatt SLA 3D-printerkurset" diff --git a/src/make_queue/static/make_queue/css/machine_list.css b/src/make_queue/static/make_queue/css/machine_list.css index a99c5b7db..ffc79a75b 100644 --- a/src/make_queue/static/make_queue/css/machine_list.css +++ b/src/make_queue/static/make_queue/css/machine_list.css @@ -11,3 +11,27 @@ margin-top: 2rem; margin-bottom: 1rem; } + +.reservation-machine-shortcut-buttons { + margin: 2rem 0 1rem 0; +} + +.reservation-machine-shortcut-buttons h4 { + display: inline; + margin-right: 0.5rem; +} + +.reservation-machine-shortcut-buttons .button { + color: black !important; +} + +@media only screen and (max-width: 700px) { + .reservation-machine-shortcut-buttons h4 { + display: block; + margin-right: unset; + } + + .reservation-machine-shortcut-buttons .button { + margin-bottom: 0.5rem; + } +} diff --git a/src/make_queue/templates/make_queue/machine_list.html b/src/make_queue/templates/make_queue/machine_list.html index ad7dcafd8..614eec3c5 100644 --- a/src/make_queue/templates/make_queue/machine_list.html +++ b/src/make_queue/templates/make_queue/machine_list.html @@ -31,10 +31,17 @@ {% translate "Find free reservation slots" %} - +
+

{% translate "Shortcuts:" %}

+ {% for machine_type in machine_types %} + {% if machine_type.shown_machines %} + {{ machine_type.name }} + {% endif %} + {% endfor %} +
{% for machine_type in machine_types %} {% if machine_type.shown_machines %} -
+
{{ machine_type.name }}