diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 5e957e9..3bb20fb 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 e8ff6e1..0537402 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-22 22:36+0200\n" +"POT-Creation-Date: 2017-03-29 16:19+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,125 +17,135 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: infoscreen/models.py:74 +#: infoscreen/models.py:75 msgid "ABB jobs" msgstr "ABB jobs" -#: infoscreen/models.py:83 -msgid "Coffee display" -msgstr "Coffee display" +#: infoscreen/models.py:85 +#, fuzzy +#| msgid "External image" +msgid "External website" +msgstr "External image" -#: infoscreen/models.py:92 +#: infoscreen/models.py:131 msgid "Sössö articles" msgstr "Sössö articles" -#: infoscreen/models.py:102 -msgid "Image upload" -msgstr "Image upload" +#: infoscreen/models.py:140 +msgid "Events" +msgstr "" -#: infoscreen/models.py:120 +#: infoscreen/models.py:152 +msgid "Image" +msgstr "" + +#: infoscreen/models.py:170 msgid "HSL timetables" msgstr "HSL timetables" -#: infoscreen/models.py:130 +#: infoscreen/models.py:180 msgid "External image" msgstr "External image" -#: infoscreen/templates/infoscreen_admin.html:22 +#: infoscreen/templates/infoscreen_admin.html:23 #: members/templates/members_base.html:60 msgid "Log out" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:29 +#: infoscreen/templates/infoscreen_admin.html:30 msgid "Infoscreen Admin Pane" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:34 +#: infoscreen/templates/infoscreen_admin.html:35 msgid "Info items" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:35 +#: infoscreen/templates/infoscreen_admin.html:36 msgid "Infoitems available for rotations" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:38 +#: infoscreen/templates/infoscreen_admin.html:39 msgid "Item" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:39 -msgid "Set duration" -msgstr "" - #: infoscreen/templates/infoscreen_admin.html:40 -msgid "Add to rotation" +msgid "Type" msgstr "" #: infoscreen/templates/infoscreen_admin.html:41 -#: infoscreen/templates/infoscreen_admin.html:47 -#: infoscreen/templates/infoscreen_admin.html:74 -#: infoscreen/templates/infoscreen_admin.html:81 -#: infoscreen/templates/infoscreen_admin.html:98 -#: infoscreen/templates/infoscreen_admin.html:102 +msgid "Set duration" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:42 +msgid "Add to rotation" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:43 +#: infoscreen/templates/infoscreen_admin.html:50 +#: infoscreen/templates/infoscreen_admin.html:77 +#: infoscreen/templates/infoscreen_admin.html:84 +#: infoscreen/templates/infoscreen_admin.html:101 +#: infoscreen/templates/infoscreen_admin.html:105 #: members/templates/member_list.html:63 msgid "Delete" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:46 +#: infoscreen/templates/infoscreen_admin.html:49 msgid "Add" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:50 +#: infoscreen/templates/infoscreen_admin.html:53 msgid "Create new item" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:53 +#: infoscreen/templates/infoscreen_admin.html:56 msgid "Item type" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:64 +#: infoscreen/templates/infoscreen_admin.html:67 msgid "Rotations" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:66 +#: infoscreen/templates/infoscreen_admin.html:69 msgid "Select rotation to edit" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:70 -#: infoscreen/templates/infoscreen_admin.html:92 +#: infoscreen/templates/infoscreen_admin.html:73 +#: infoscreen/templates/infoscreen_admin.html:95 msgid "Rotation" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:71 +#: infoscreen/templates/infoscreen_admin.html:74 msgid "id" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:72 -#: infoscreen/templates/infoscreen_admin.html:79 +#: infoscreen/templates/infoscreen_admin.html:75 +#: infoscreen/templates/infoscreen_admin.html:82 msgid "Select" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:73 -#: infoscreen/templates/infoscreen_admin.html:80 +#: infoscreen/templates/infoscreen_admin.html:76 +#: infoscreen/templates/infoscreen_admin.html:83 msgid "Preview" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:84 +#: infoscreen/templates/infoscreen_admin.html:87 msgid "Name" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:85 +#: infoscreen/templates/infoscreen_admin.html:88 msgid "Create new" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:93 +#: infoscreen/templates/infoscreen_admin.html:96 msgid "Instances in currently selected rotation" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:96 +#: infoscreen/templates/infoscreen_admin.html:99 msgid "Instance" msgstr "" -#: infoscreen/templates/infoscreen_admin.html:97 +#: infoscreen/templates/infoscreen_admin.html:100 msgid "Duration" msgstr "" @@ -243,11 +253,13 @@ msgstr "" msgid "Member register of SIK ry" msgstr "" -#: sikweb/settings-sample.py:162 sikweb/settings.py:161 +#: sikweb/settings-docker-sample.py:170 sikweb/settings-sample.py:170 +#: sikweb/settings.py:170 msgid "English" msgstr "" -#: sikweb/settings-sample.py:163 sikweb/settings.py:162 +#: sikweb/settings-docker-sample.py:171 sikweb/settings-sample.py:171 +#: sikweb/settings.py:171 msgid "Finnish" msgstr "" @@ -286,3 +298,9 @@ msgstr "" #: webapp/templates/navigation.html:32 msgid "Contact" msgstr "" + +#~ msgid "Coffee display" +#~ msgstr "Coffee display" + +#~ msgid "Image upload" +#~ msgstr "Image upload" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index ae1fa52..cf8c63d 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 5f31d7b..852cd4c 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-22 22:36+0200\n" +"POT-Creation-Date: 2017-03-29 16:19+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,125 +18,133 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: infoscreen/models.py:74 +#: infoscreen/models.py:75 msgid "ABB jobs" msgstr "ABB-työpaikat" -#: infoscreen/models.py:83 -msgid "Coffee display" -msgstr "Kahvinäyttö" +#: infoscreen/models.py:85 +msgid "External website" +msgstr "Ulkoinen kuva" -#: infoscreen/models.py:92 +#: infoscreen/models.py:131 msgid "Sössö articles" msgstr "Sössön artikkelit" -#: infoscreen/models.py:102 -msgid "Image upload" -msgstr "Kuvan lataus" +#: infoscreen/models.py:140 +msgid "Events" +msgstr "Tapahtumat" -#: infoscreen/models.py:120 +#: infoscreen/models.py:152 +msgid "Image" +msgstr "Kuva" + +#: infoscreen/models.py:170 msgid "HSL timetables" msgstr "HSL-aikataulut" -#: infoscreen/models.py:130 +#: infoscreen/models.py:180 msgid "External image" msgstr "Ulkoinen kuva" -#: infoscreen/templates/infoscreen_admin.html:22 +#: infoscreen/templates/infoscreen_admin.html:23 #: members/templates/members_base.html:60 msgid "Log out" msgstr "Kirjaudu ulos" -#: infoscreen/templates/infoscreen_admin.html:29 +#: infoscreen/templates/infoscreen_admin.html:30 msgid "Infoscreen Admin Pane" msgstr "Infonäyttöjen hallintapaneeli" -#: infoscreen/templates/infoscreen_admin.html:34 +#: infoscreen/templates/infoscreen_admin.html:35 msgid "Info items" msgstr "Diat" -#: infoscreen/templates/infoscreen_admin.html:35 +#: infoscreen/templates/infoscreen_admin.html:36 msgid "Infoitems available for rotations" msgstr "Rotaatioon lisättävät diat" -#: infoscreen/templates/infoscreen_admin.html:38 +#: infoscreen/templates/infoscreen_admin.html:39 msgid "Item" msgstr "Dia" -#: infoscreen/templates/infoscreen_admin.html:39 +#: infoscreen/templates/infoscreen_admin.html:40 +msgid "Type" +msgstr "Tyyppi" + +#: infoscreen/templates/infoscreen_admin.html:41 msgid "Set duration" msgstr "Aseta kesto" -#: infoscreen/templates/infoscreen_admin.html:40 +#: infoscreen/templates/infoscreen_admin.html:42 msgid "Add to rotation" msgstr "Lisää rotaatioon" -#: infoscreen/templates/infoscreen_admin.html:41 -#: infoscreen/templates/infoscreen_admin.html:47 -#: infoscreen/templates/infoscreen_admin.html:74 -#: infoscreen/templates/infoscreen_admin.html:81 -#: infoscreen/templates/infoscreen_admin.html:98 -#: infoscreen/templates/infoscreen_admin.html:102 +#: infoscreen/templates/infoscreen_admin.html:43 +#: infoscreen/templates/infoscreen_admin.html:50 +#: infoscreen/templates/infoscreen_admin.html:77 +#: infoscreen/templates/infoscreen_admin.html:84 +#: infoscreen/templates/infoscreen_admin.html:101 +#: infoscreen/templates/infoscreen_admin.html:105 #: members/templates/member_list.html:63 msgid "Delete" msgstr "Poista" -#: infoscreen/templates/infoscreen_admin.html:46 +#: infoscreen/templates/infoscreen_admin.html:49 msgid "Add" msgstr "Lisää" -#: infoscreen/templates/infoscreen_admin.html:50 +#: infoscreen/templates/infoscreen_admin.html:53 msgid "Create new item" msgstr "Luo uusi dia" -#: infoscreen/templates/infoscreen_admin.html:53 +#: infoscreen/templates/infoscreen_admin.html:56 msgid "Item type" msgstr "Diatyyppi" -#: infoscreen/templates/infoscreen_admin.html:64 +#: infoscreen/templates/infoscreen_admin.html:67 msgid "Rotations" msgstr "Rotaatiot" -#: infoscreen/templates/infoscreen_admin.html:66 +#: infoscreen/templates/infoscreen_admin.html:69 msgid "Select rotation to edit" msgstr "Valitse muokattava rotaatio" -#: infoscreen/templates/infoscreen_admin.html:70 -#: infoscreen/templates/infoscreen_admin.html:92 +#: infoscreen/templates/infoscreen_admin.html:73 +#: infoscreen/templates/infoscreen_admin.html:95 msgid "Rotation" msgstr "Rotaatio" -#: infoscreen/templates/infoscreen_admin.html:71 +#: infoscreen/templates/infoscreen_admin.html:74 msgid "id" msgstr "id" -#: infoscreen/templates/infoscreen_admin.html:72 -#: infoscreen/templates/infoscreen_admin.html:79 +#: infoscreen/templates/infoscreen_admin.html:75 +#: infoscreen/templates/infoscreen_admin.html:82 msgid "Select" msgstr "Valitse" -#: infoscreen/templates/infoscreen_admin.html:73 -#: infoscreen/templates/infoscreen_admin.html:80 +#: infoscreen/templates/infoscreen_admin.html:76 +#: infoscreen/templates/infoscreen_admin.html:83 msgid "Preview" msgstr "Esikatsele" -#: infoscreen/templates/infoscreen_admin.html:84 +#: infoscreen/templates/infoscreen_admin.html:87 msgid "Name" msgstr "Nimi" -#: infoscreen/templates/infoscreen_admin.html:85 +#: infoscreen/templates/infoscreen_admin.html:88 msgid "Create new" msgstr "Luo uusi" -#: infoscreen/templates/infoscreen_admin.html:93 +#: infoscreen/templates/infoscreen_admin.html:96 msgid "Instances in currently selected rotation" msgstr "Nykyisen rotaation diat" -#: infoscreen/templates/infoscreen_admin.html:96 +#: infoscreen/templates/infoscreen_admin.html:99 msgid "Instance" msgstr "Dia" -#: infoscreen/templates/infoscreen_admin.html:97 +#: infoscreen/templates/infoscreen_admin.html:100 msgid "Duration" msgstr "Kesto" @@ -244,11 +252,13 @@ msgstr "Jäsenhakemus" msgid "Member register of SIK ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" -#: sikweb/settings-sample.py:162 sikweb/settings.py:161 +#: sikweb/settings-docker-sample.py:170 sikweb/settings-sample.py:170 +#: sikweb/settings.py:170 msgid "English" msgstr "englanti" -#: sikweb/settings-sample.py:163 sikweb/settings.py:162 +#: sikweb/settings-docker-sample.py:171 sikweb/settings-sample.py:171 +#: sikweb/settings.py:171 msgid "Finnish" msgstr "suomi" @@ -261,7 +271,6 @@ msgid "SIK Admin" msgstr "SIK Hallintapaneeli" #: webapp/templates/main_index.html:7 -#, fuzzy msgid "Members" msgstr "Jäsenlistaus"