diff --git a/infoscreen/static/html/infoscreen_admin.html b/infoscreen/static/html/infoscreen_admin.html deleted file mode 100644 index 083df35..0000000 --- a/infoscreen/static/html/infoscreen_admin.html +++ /dev/null @@ -1,55 +0,0 @@ -
-
-

Info items

-
Infoitems available for rotations:
- - - - - - - - -
ItemSet durationAdd to rotationDelete
{{i.name}}
-

Create new item

- - - - -
Item type
-
-
-
-

Rotations

-
- Select rotation to edit: -
- - - - - - - - - - - - - - -
RotationSelectDelete
{{r.name}}
- -

Rotation: {{selected_rot.name}}

-
Instances in currently selected rotation:
- - - - - - - - - @@ -13,13 +15,90 @@ +
+
+
+

{% trans "Infoscreen Admin Pane" %}

+
+
+
+
+

{% trans "Info items" %}

+
{% trans "Infoitems available for rotations" %}
+
InstanceDurationDelete
{{i.item.name}}{{i.duration}}s
+ + + + + + + + + + + + +
{% trans "Item" %}{% trans "Set duration" %}{% trans "Add to rotation" %}{% trans "Delete" %}
{$ i.name $}
+

{% trans "Create new item" %}

+ + + + + +
{% trans "Item type" %} + +
+
+
+
+

{% trans "Rotations" %}

+
+ {% trans "Select rotation to edit" %}: +
+ + + + + + + + + + + + + + + + +
{% trans "Rotation" %}{% trans "Select" %}{% trans "Delete" %}
{$ r.name $}
-
+

{% trans "Rotation" %}: {$ selected_rot.name $}

+
{% trans "Instances in currently selected rotation" %}:
+ + + + + + + + + + +
{% trans "Instance" %}{% trans "Duration" %}{% trans "Delete" %}
{$ i.item.name $}{$ i.duration $} s
+
+
+
+ {% include "footer.html" %} +
+ diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 00de228..56dcd95 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 9ee7f2c..888e114 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-06 01:08+0200\n" +"POT-Creation-Date: 2017-02-06 19:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,90 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: infoscreen/templates/infoscreen_admin.html:20 +#: members/templates/members_base.html:67 +msgid "Log out" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:27 +msgid "Infoscreen Admin Pane" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:32 +msgid "Info items" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:33 +msgid "Infoitems available for rotations" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:36 +msgid "Item" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:37 +msgid "Set duration" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:38 +msgid "Add to rotation" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:39 +#: infoscreen/templates/infoscreen_admin.html:70 +#: infoscreen/templates/infoscreen_admin.html:75 +#: infoscreen/templates/infoscreen_admin.html:90 +#: infoscreen/templates/infoscreen_admin.html:94 +#: members/templates/member_list.html:63 +msgid "Delete" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:48 +msgid "Create new item" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:51 +msgid "Item type" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:62 +msgid "Rotations" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:64 +msgid "Select rotation to edit" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:68 +#: infoscreen/templates/infoscreen_admin.html:84 +msgid "Rotation" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:69 +#: infoscreen/templates/infoscreen_admin.html:74 +msgid "Select" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:78 +msgid "Name" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:79 +msgid "Create new" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:85 +msgid "Instances in currently selected rotation" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:88 +msgid "Instance" +msgstr "" + +#: infoscreen/templates/infoscreen_admin.html:89 +msgid "Duration" +msgstr "" + #: members/templates/member_list.html:13 members/templates/member_list.html:45 msgid "Added" msgstr "" @@ -97,10 +181,6 @@ msgstr "" msgid "Edit" msgstr "" -#: members/templates/member_list.html:63 -msgid "Delete" -msgstr "" - #: members/templates/member_list.html:63 msgid "Are you sure?" msgstr "" @@ -125,10 +205,6 @@ msgstr "" msgid "Member register of SIK ry" msgstr "" -#: members/templates/members_base.html:67 -msgid "Log out" -msgstr "" - #: sikweb/settings-sample.py:141 sikweb/settings.py:146 msgid "English" msgstr "" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 25341df..5459a17 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 5afa4b9..dff19d9 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-06 01:08+0200\n" +"POT-Creation-Date: 2017-02-06 19:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,90 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: infoscreen/templates/infoscreen_admin.html:20 +#: members/templates/members_base.html:67 +msgid "Log out" +msgstr "Kirjaudu ulos" + +#: infoscreen/templates/infoscreen_admin.html:27 +msgid "Infoscreen Admin Pane" +msgstr "Infonäyttöjen hallintapaneeli" + +#: infoscreen/templates/infoscreen_admin.html:32 +msgid "Info items" +msgstr "Diat" + +#: infoscreen/templates/infoscreen_admin.html:33 +msgid "Infoitems available for rotations" +msgstr "Rotaatioon lisättävät diat" + +#: infoscreen/templates/infoscreen_admin.html:36 +msgid "Item" +msgstr "Dia" + +#: infoscreen/templates/infoscreen_admin.html:37 +msgid "Set duration" +msgstr "Aseta kesto" + +#: infoscreen/templates/infoscreen_admin.html:38 +msgid "Add to rotation" +msgstr "Lisää rotaatioon" + +#: infoscreen/templates/infoscreen_admin.html:39 +#: infoscreen/templates/infoscreen_admin.html:70 +#: infoscreen/templates/infoscreen_admin.html:75 +#: infoscreen/templates/infoscreen_admin.html:90 +#: infoscreen/templates/infoscreen_admin.html:94 +#: members/templates/member_list.html:63 +msgid "Delete" +msgstr "Poista" + +#: infoscreen/templates/infoscreen_admin.html:48 +msgid "Create new item" +msgstr "Luo uusi dia" + +#: infoscreen/templates/infoscreen_admin.html:51 +msgid "Item type" +msgstr "Diatyyppi" + +#: infoscreen/templates/infoscreen_admin.html:62 +msgid "Rotations" +msgstr "Rotaatiot" + +#: infoscreen/templates/infoscreen_admin.html:64 +msgid "Select rotation to edit" +msgstr "Valitse muokattava rotaatio" + +#: infoscreen/templates/infoscreen_admin.html:68 +#: infoscreen/templates/infoscreen_admin.html:84 +msgid "Rotation" +msgstr "Rotaatio" + +#: infoscreen/templates/infoscreen_admin.html:69 +#: infoscreen/templates/infoscreen_admin.html:74 +msgid "Select" +msgstr "Valitse" + +#: infoscreen/templates/infoscreen_admin.html:78 +msgid "Name" +msgstr "Nimi" + +#: infoscreen/templates/infoscreen_admin.html:79 +msgid "Create new" +msgstr "Luo uusi" + +#: infoscreen/templates/infoscreen_admin.html:85 +msgid "Instances in currently selected rotation" +msgstr "Nykyisen rotaation diat" + +#: infoscreen/templates/infoscreen_admin.html:88 +msgid "Instance" +msgstr "Dia" + +#: infoscreen/templates/infoscreen_admin.html:89 +msgid "Duration" +msgstr "Kesto" + #: members/templates/member_list.html:13 members/templates/member_list.html:45 msgid "Added" msgstr "Lisätty" @@ -60,7 +144,7 @@ msgstr "Jäsenrekisteri" #: members/templates/member_list.html:33 msgid "Download CSV" -msgstr "" +msgstr "Lataa CSV" #: members/templates/member_list.html:39 msgid "Last name" @@ -98,10 +182,6 @@ msgstr "Päivitä maksu" msgid "Edit" msgstr "Muokkaa" -#: members/templates/member_list.html:63 -msgid "Delete" -msgstr "Poista" - #: members/templates/member_list.html:63 msgid "Are you sure?" msgstr "Oletko varma?" @@ -126,10 +206,6 @@ msgstr "Jäsenhakemus" msgid "Member register of SIK ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" -#: members/templates/members_base.html:67 -msgid "Log out" -msgstr "Kirjaudu ulos" - #: sikweb/settings-sample.py:141 sikweb/settings.py:146 msgid "English" msgstr "englanti" @@ -140,7 +216,7 @@ msgstr "suomi" #: templates/footer.html:11 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -msgstr "" +msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" #~ msgid "Change language" #~ msgstr "Vaihda kieli"