diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..d3db8d386f26e0e850f12a2ca81c3e7e38b90a1a
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//VIPSWeb/local_settings.py=UTF-8
+encoding//forecasts/models.py=utf-8
diff --git a/LICENSE.txt b/LICENSE.txt
index a871fcfd0f388fb04465c6c870f0c52967397ed1..e9a17ef92e7c5f15bbdc33e0f69a838f4a5d0747 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,66 +1,68 @@
- GNU AFFERO GENERAL PUBLIC LICENSE
- Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
- A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation. However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
- The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community. It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server. Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
- An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals. This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU Affero General Public License.
+ BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014)
+
+ PREAMBLE AND ADDITIONAL TERMS
+
+ The original licensor is the Norwegian Institute for Agricultural and
+Environmental Research, registered in Norway with registration number 988 983
+837, and business address NO-1430 ÅS, NORWAY, hereafter referred to as
+"BIOFORSK".
+
+ This BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014), in short the BIOFORSK Open
+Source License, is based on the GNU Affero General Public License, version 3.
+All of the terms and conditions of the GNU Affero General Public License,
+version 3, have been set out below, save the below mentioned additional
+prevailing terms that have priority over the terms otherwise identical to the
+GNU Affero General Public License, version 3, and that Section 0 ("This
+License" definition changed), 13 ("version 3 of the GNU General Public License"
+replaced by "this License") and 14 ("The Free Software Foundation" replaced by
+"BIOFORSK" and "GNU Affero General Public License" replaced by "License") have
+been adjusted as a consequence of this.
+
+ ADDITONAL PREVAILING TERMS
+
+ (a) The BIOFORSK Open Source License regulates the BIOFORSK VIPS Platform
+software, an Internet based system enabling prediction of infection risk of
+plant diseases, pests and weeds. The BIOFORSK Open Source License DOES NOT
+INCLUDE the specific forecasting models, neither their algorithms nor their
+implementation to be used by the BIOFORSK VIPS Platform. You are free to
+implement any other forecasting model to be used by the BIOFORSK VIPS Platform,
+regardless of license terms at your own responsibility.
+
+ (b) This license is governed by Norwegian law, as far as any party or third
+party purports or sets forward any claim towards BIOFORSK. Any claims towards
+BIOFORSK shall be solved by the exclusive venue of Oslo City Courts, Norway.
+This paragraph is not applicable for claims only between any later parties to
+this license.
+
+ (c) By entering into this agreement you also agree to indemnify BIOFORSK and
+its employees / consultants / board, for any claims of liability related to
+this license set forward by yourself or any party deviating its rights from you.
+
+ (d) You shall include the following in the start of each source file:
+
+ Copyright (c) <year> <name of author>
+
+ This file is part of <application name>. <application name> is free
+ software: you can redistribute it and/or modify it under the terms of
+ the Bioforsk Open Source License as published by Bioforsk, either
+ version 1 of the License, or (at your option) any later version.
+
+ <application name> is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with <application name>. If not, see
+ <http://www.bioforsk.no/licenses/>.
+
+ Also add information on how to contact you by electronic and paper mail.
+
+ 1. TERMS AND CONDITIONS
+
+ 2. 0. Definitions.
+
+ "This License" refers to BIOFORSK Open Source License v.1.0 (2014).
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
@@ -97,7 +99,7 @@ work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
- 1. Source Code.
+ 3. 1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
@@ -139,7 +141,7 @@ Source.
The Corresponding Source for a work in source code form is that
same work.
- 2. Basic Permissions.
+ 4. 2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
@@ -164,7 +166,7 @@ your copyrighted material outside their relationship with you.
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+ 5. 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
@@ -180,7 +182,7 @@ modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
- 4. Conveying Verbatim Copies.
+ 6. 4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
@@ -193,7 +195,7 @@ recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
- 5. Conveying Modified Source Versions.
+ 7. 5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
@@ -230,7 +232,7 @@ beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
- 6. Conveying Non-Source Forms.
+ 8. 6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
@@ -328,7 +330,7 @@ documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
- 7. Additional Terms.
+ 9. 7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
@@ -392,7 +394,7 @@ where to find the applicable terms.
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
- 8. Termination.
+ 10. 8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
@@ -420,7 +422,7 @@ this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
- 9. Acceptance Not Required for Having Copies.
+ 11. 9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
@@ -431,7 +433,7 @@ modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
- 10. Automatic Licensing of Downstream Recipients.
+ 12. 10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
@@ -456,7 +458,7 @@ rights granted under this License, and you may not initiate litigation
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
- 11. Patents.
+ 13. 11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
@@ -525,7 +527,7 @@ or that patent license was granted, prior to 28 March 2007.
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
- 12. No Surrender of Others' Freedom.
+ 14. 12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
@@ -537,7 +539,7 @@ to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
- 13. Remote Network Interaction; Use with the GNU General Public License.
+ 15. 13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
@@ -546,9 +548,8 @@ supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
+shall include the Corresponding Source for any work covered by This License
+that is incorporated pursuant to the following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
@@ -558,33 +559,30 @@ License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
- 14. Revised Versions of this License.
+ 16. 14. Revised Versions of this License.
- The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+ BIOFORSK may publish revised and/or new versions of the License from time to
+time. Such new versions will be similar in spirit to the present version, but
+may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
+Program specifies that a certain numbered version of the License "or any later
+version" applies to it, you have the option of following the terms and
+conditions either of that numbered version or of any later version published by
+BIOFORSK. If the Program does not specify a version number of the License, you
+may choose any version ever published by the BIOFORSK.
If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
+versions of the License can be used, that proxy's public statement of
+acceptance of a version permanently authorizes you to choose that version for
+the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
- 15. Disclaimer of Warranty.
+ 17. 15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
@@ -595,7 +593,7 @@ PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- 16. Limitation of Liability.
+ 18. 16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
@@ -607,7 +605,7 @@ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
- 17. Interpretation of Sections 15 and 16.
+ 19. 17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
@@ -616,47 +614,4 @@ an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source. For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code. There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
-
+ END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/VIPSWeb/context_processors.py b/VIPSWeb/context_processors.py
index a5e1a3c2e066c976ed77b209f5539f0402509796..ffa835b14bf17b2396b8965f54b4416432cd9952 100644
--- a/VIPSWeb/context_processors.py
+++ b/VIPSWeb/context_processors.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
+#
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.conf import settings as _settings
diff --git a/VIPSWeb/local_settings_sample.py b/VIPSWeb/local_settings_sample.py
index 27fbee0cf8a297cc76244734aaa6155f66334bac..bb7d993b9a1cb27036fb0c25fc568a5fd9453b68 100644
--- a/VIPSWeb/local_settings_sample.py
+++ b/VIPSWeb/local_settings_sample.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
+#
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
## SAMPLE local_settings file. Copy to local_settings.py and configure as needed.
## Keep local_settings.py out of repository!! (already added to .gitignore)
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.po b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..6f7091affd17030995a65731a3e8cfc44d8d288e
--- /dev/null
+++ b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,68 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-08 18:20+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: templates/base.html:45
+msgid "Toggle navigation"
+msgstr ""
+
+#: templates/base.html:56
+msgid "Forecasts"
+msgstr ""
+
+#: templates/base.html:57 templates/index.html:64
+msgid "Messages"
+msgstr ""
+
+#: templates/base.html:59
+msgid "Dropdown"
+msgstr ""
+
+#: templates/base.html:61
+msgid "Action"
+msgstr ""
+
+#: templates/base.html:62
+msgid "Another action"
+msgstr ""
+
+#: templates/base.html:63
+msgid "Something else here"
+msgstr ""
+
+#: templates/base.html:64
+msgid "Separated link"
+msgstr ""
+
+#: templates/base.html:65
+msgid "One more separated link"
+msgstr ""
+
+#: templates/base.html:137
+msgid "This is the default page contents."
+msgstr ""
+
+#: templates/index.html:22
+msgid "Welcome"
+msgstr ""
+
+#: templates/index.html:51
+msgid "Crops"
+msgstr ""
diff --git a/VIPSWeb/locale/hr/LC_MESSAGES/django.po b/VIPSWeb/locale/hr/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..5905a089be2e8c793cbb8dfaa8fd0944c46536ba
--- /dev/null
+++ b/VIPSWeb/locale/hr/LC_MESSAGES/django.po
@@ -0,0 +1,68 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-10 12:47+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: templates/base.html:45
+msgid "Toggle navigation"
+msgstr ""
+
+#: templates/base.html:56
+msgid "Forecasts"
+msgstr ""
+
+#: templates/base.html:57 templates/index.html:64
+msgid "Messages"
+msgstr ""
+
+#: templates/base.html:59
+msgid "Dropdown"
+msgstr ""
+
+#: templates/base.html:61
+msgid "Action"
+msgstr ""
+
+#: templates/base.html:62
+msgid "Another action"
+msgstr ""
+
+#: templates/base.html:63
+msgid "Something else here"
+msgstr ""
+
+#: templates/base.html:64
+msgid "Separated link"
+msgstr ""
+
+#: templates/base.html:65
+msgid "One more separated link"
+msgstr ""
+
+#: templates/base.html:137
+msgid "This is the default page contents."
+msgstr ""
+
+#: templates/index.html:22
+msgid "Welcome"
+msgstr ""
+
+#: templates/index.html:51
+msgid "Crops"
+msgstr ""
diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py
index 29ab44deb5aac369d0093c100ba63d0a1b25530a..5c6a651b7dbd85123fb1e22ad6cfee603fba3a2a 100644
--- a/VIPSWeb/settings.py
+++ b/VIPSWeb/settings.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
# Django settings for VIPSWeb project.
import os
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
index edc6b684a931be7082ce68cfb657f848b049eb1a..e29ffb8b8089b268b1c8fbd675f63c9cd84351b4 100644
--- a/VIPSWeb/static/css/vipsweb.css
+++ b/VIPSWeb/static/css/vipsweb.css
@@ -3,17 +3,17 @@
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the Bioforsk Open Source License as published by
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
*
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/VIPSWeb/static/js/forecastmap.js b/VIPSWeb/static/js/forecastmap.js
index d04b1e568e4953ad4ca0c3c0c49e117083761804..37bd862b0bd873caf0ae9bd988c1e56079f5935a 100644
--- a/VIPSWeb/static/js/forecastmap.js
+++ b/VIPSWeb/static/js/forecastmap.js
@@ -3,17 +3,17 @@
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the Bioforsk Open Source License as published by
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
*
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
@@ -52,7 +52,14 @@ function initForecastMap(lonLat, zoomLevel, organizationId, sourceHostname, mapA
]
})
});
-
+ // Bing Maps example
+ /*var backgroundLayer = new ol.layer.Tile({
+ source: new ol.source.BingMaps({
+ key: 'AgBNAZzyzjb-tmdpNGxAQGtvVQryg5Vm3ZekaYVk2iwWNmu41CVxdPYjTXrKQ9ac',
+ imagerySet: 'Aerial'
+ })
+ })
+ */
// Fetching KML from VIPSLogic
// Filtering with crop ids
diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html
index a7bf735a9d605edf905897a82dbb31850b494c90..958fcb9effe876467fe8b10db6928983efdc5d72 100644
--- a/VIPSWeb/templates/base.html
+++ b/VIPSWeb/templates/base.html
@@ -1,20 +1,23 @@
{% comment %}
- Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
-
- This file is part of VIPSWeb.
- VIPSWeb is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- VIPSWeb is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+ /*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSWeb.
+ * VIPSWeb is free software: you can redistribute it and/or modify
+ * it under the terms of the Bioforsk Open Source License as published by
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
+ *
+ * VIPSWeb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Bioforsk Open Source License for more details.
+ *
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ *
+ */
{% endcomment %}{% load i18n staticfiles %}<!DOCTYPE html>
<html lang="no">
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index 6ad23951acc6855acb743a0e65751ea3e77a5273..1a86ad21a3cc492359cdfd840bd354b8adcb9ac4 100644
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -1,21 +1,24 @@
{% extends "base.html" %}
{% comment %}
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
- This file is part of VIPSWeb.
- VIPSWeb is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- VIPSWeb is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ *
+ * This file is part of VIPSWeb.
+ * VIPSWeb is free software: you can redistribute it and/or modify
+ * it under the terms of the Bioforsk Open Source License as published by
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
+ *
+ * VIPSWeb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Bioforsk Open Source License for more details.
+ *
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ *
+ */
{% endcomment %}
{% load i18n l10n staticfiles forecast_extras %}
diff --git a/VIPSWeb/urls.py b/VIPSWeb/urls.py
index 716583459728b8e458fdfe3e910f7bb99c0f0dfb..fa42198de8e5e49ab09766e0f85401eb6c8ca0c8 100644
--- a/VIPSWeb/urls.py
+++ b/VIPSWeb/urls.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.conf.urls import patterns, include, url
#from django.views.generic import TemplateView
diff --git a/VIPSWeb/views.py b/VIPSWeb/views.py
index d5e54b297a147d8576378ac86e10a2471919afac..60e00c4e30d0057df1db4b994a82263da1ec0f8d 100644
--- a/VIPSWeb/views.py
+++ b/VIPSWeb/views.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.shortcuts import render
from django.conf import settings
diff --git a/VIPSWeb/wsgi.py b/VIPSWeb/wsgi.py
index f2decc8a1902438f3e78229025c64ba3bf1ae23e..aa40a57eb7a6c49e2846eaa9381c24ce8cc6ea57 100644
--- a/VIPSWeb/wsgi.py
+++ b/VIPSWeb/wsgi.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
"""
WSGI config for VIPSWeb project.
diff --git a/common/middleware/whodid.py b/common/middleware/whodid.py
index 00cb7a73b18fd0fcc88836f168080f5ed264b36b..cc90dbfc2d1516569f774f1e69a889b7a2d7ca1b 100644
--- a/common/middleware/whodid.py
+++ b/common/middleware/whodid.py
@@ -1,20 +1,21 @@
"""
- Copyright (C) 2014 Bioforsk/mindlace
-
- This file is part of VIPSWeb
-
- VIPSWeb is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- VIPSWeb is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
+#
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
"""
"""
Add user created_by and modified_by foreign key refs to any model automatically.
diff --git a/forecasts/admin.py b/forecasts/admin.py
index 7418550bc653907478cc23ae9364a209c868e7b8..0b9b0b0d2badbc531176fff12d0a5caf19e0925f 100644
--- a/forecasts/admin.py
+++ b/forecasts/admin.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
-
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.contrib import admin
from forecasts.models import ResultParameter, MeasurementUnit, ModelGraphParameter
diff --git a/forecasts/locale/bs/LC_MESSAGES/django.po b/forecasts/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..5a8e1a43139fb8c4fccbb4d0afade51795f5ad6b
--- /dev/null
+++ b/forecasts/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,98 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VIPS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-08 18:26+0200\n"
+"PO-Revision-Date: 2014-10-10 13:04+0100\n"
+"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
+"Language-Team: LANGUAGE <wvjeko@gmail.com>\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.6.9\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: templates/forecasts/detail.html:22 templates/forecasts/detail.html.py:24
+msgid "Details"
+msgstr "Detalji"
+
+#: templates/forecasts/detail.html:36
+msgid "Model"
+msgstr "Model"
+
+#: templates/forecasts/detail.html:37 templates/forecasts/index.html:31
+msgid "Location"
+msgstr "Lokacija"
+
+#: templates/forecasts/detail.html:38
+msgid "Weather station"
+msgstr "Meteo stanica"
+
+#: templates/forecasts/detail.html:38
+msgid "Distance to location"
+msgstr "Udaljenost od lokacija"
+
+#: templates/forecasts/detail.html:39
+msgid "Period"
+msgstr "Razdoblje "
+
+#: templates/forecasts/detail.html:49
+msgid "Timestamp"
+msgstr "Točno vrijeme "
+
+#: templates/forecasts/detail.html:50
+msgid "Warning status"
+msgstr "Status upozorenja"
+
+#: templates/forecasts/detail.html:70
+msgid "No results for this forecast"
+msgstr "Nema rezultata za ovu prognozu"
+
+#: templates/forecasts/index.html:22 templates/forecasts/index.html.py:24
+msgid "Forecasts"
+msgstr "Prognoze"
+
+#: templates/forecasts/index.html:29
+msgid "Model name"
+msgstr "Ime modela "
+
+#: templates/forecasts/index.html:30
+msgid "Crop"
+msgstr "Usjev"
+
+#: templates/forecasts/index.html:32
+msgid "Date start"
+msgstr "Datum početka"
+
+#: templates/forecasts/index.html:33
+msgid "Date end"
+msgstr "Datum završetka "
+
+#: templates/forecasts/index.html:45
+msgid "Results"
+msgstr "Rezultati "
+
+#: templates/models/detail.html:22 templates/models/index.html:22
+#: templates/models/index.html.py:24
+msgid "Models"
+msgstr "Modeli"
+
+#: templates/models/detail.html:26
+msgid "Description"
+msgstr "Opis"
+
+#: templates/models/detail.html:27
+msgid "Usage"
+msgstr "Korisnost "
+
+#: templates/models/detail.html:28
+msgid "Sample configuration"
+msgstr "Primjer konfiguracije "
diff --git a/forecasts/locale/hr/LC_MESSAGES/django.po b/forecasts/locale/hr/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..5a8e1a43139fb8c4fccbb4d0afade51795f5ad6b
--- /dev/null
+++ b/forecasts/locale/hr/LC_MESSAGES/django.po
@@ -0,0 +1,98 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VIPS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-08 18:26+0200\n"
+"PO-Revision-Date: 2014-10-10 13:04+0100\n"
+"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
+"Language-Team: LANGUAGE <wvjeko@gmail.com>\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.6.9\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: templates/forecasts/detail.html:22 templates/forecasts/detail.html.py:24
+msgid "Details"
+msgstr "Detalji"
+
+#: templates/forecasts/detail.html:36
+msgid "Model"
+msgstr "Model"
+
+#: templates/forecasts/detail.html:37 templates/forecasts/index.html:31
+msgid "Location"
+msgstr "Lokacija"
+
+#: templates/forecasts/detail.html:38
+msgid "Weather station"
+msgstr "Meteo stanica"
+
+#: templates/forecasts/detail.html:38
+msgid "Distance to location"
+msgstr "Udaljenost od lokacija"
+
+#: templates/forecasts/detail.html:39
+msgid "Period"
+msgstr "Razdoblje "
+
+#: templates/forecasts/detail.html:49
+msgid "Timestamp"
+msgstr "Točno vrijeme "
+
+#: templates/forecasts/detail.html:50
+msgid "Warning status"
+msgstr "Status upozorenja"
+
+#: templates/forecasts/detail.html:70
+msgid "No results for this forecast"
+msgstr "Nema rezultata za ovu prognozu"
+
+#: templates/forecasts/index.html:22 templates/forecasts/index.html.py:24
+msgid "Forecasts"
+msgstr "Prognoze"
+
+#: templates/forecasts/index.html:29
+msgid "Model name"
+msgstr "Ime modela "
+
+#: templates/forecasts/index.html:30
+msgid "Crop"
+msgstr "Usjev"
+
+#: templates/forecasts/index.html:32
+msgid "Date start"
+msgstr "Datum početka"
+
+#: templates/forecasts/index.html:33
+msgid "Date end"
+msgstr "Datum završetka "
+
+#: templates/forecasts/index.html:45
+msgid "Results"
+msgstr "Rezultati "
+
+#: templates/models/detail.html:22 templates/models/index.html:22
+#: templates/models/index.html.py:24
+msgid "Models"
+msgstr "Modeli"
+
+#: templates/models/detail.html:26
+msgid "Description"
+msgstr "Opis"
+
+#: templates/models/detail.html:27
+msgid "Usage"
+msgstr "Korisnost "
+
+#: templates/models/detail.html:28
+msgid "Sample configuration"
+msgstr "Primjer konfiguracije "
diff --git a/forecasts/models.py b/forecasts/models.py
index 54504a373b1a5f15c1d9060b4da6c18adde20a0d..1844ec23e2dcb2b8ca17d16f11e1402df5225264 100644
--- a/forecasts/models.py
+++ b/forecasts/models.py
@@ -1,21 +1,21 @@
# coding: utf-8
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
-
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from datetime import datetime
import math
diff --git a/forecasts/templates/forecasts/detail.html b/forecasts/templates/forecasts/detail.html
index c2bcdc6821ed623e7bc8077f4a871128407cb3f7..a45971a78ee22693d3950d06a4c15a3368d703d6 100644
--- a/forecasts/templates/forecasts/detail.html
+++ b/forecasts/templates/forecasts/detail.html
@@ -1,21 +1,23 @@
{% extends "base.html" %}
{% comment %}
- Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
-
- This file is part of VIPSWeb.
- VIPSWeb is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- VIPSWeb is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
+#
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
{% endcomment %}
{% load i18n l10n staticfiles forecast_extras %}
diff --git a/forecasts/templates/forecasts/index.html b/forecasts/templates/forecasts/index.html
index 16253f392c0860ece341521af81f4307155c9fd1..f9da3ec5a7d893dd73c970d450f95d08469f9936 100644
--- a/forecasts/templates/forecasts/index.html
+++ b/forecasts/templates/forecasts/index.html
@@ -1,21 +1,23 @@
{% extends "base.html" %}
{% comment %}
- Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
-
- This file is part of VIPSWeb.
- VIPSWeb is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- VIPSWeb is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
+#
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
{% endcomment %}
{% load i18n %}
diff --git a/forecasts/templates/models/detail.html b/forecasts/templates/models/detail.html
index 04d38766ebaea76162f0c2cc8ac3aa02358e8e64..3b88d1ad767550168a6220a6edad39c9593efa73 100644
--- a/forecasts/templates/models/detail.html
+++ b/forecasts/templates/models/detail.html
@@ -1,22 +1,22 @@
{% extends "base.html" %}
{% comment %}
-
- Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
-
- This file is part of VIPSWeb.
- VIPSWeb is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- VIPSWeb is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
-
+#
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
+#
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
{% endcomment %}
{% load i18n %}
{% block title%}{{model.local_name}} - {% trans "Models" %}{%endblock%}
diff --git a/forecasts/templates/models/index.html b/forecasts/templates/models/index.html
index a68d9f3bc357e8ffcfbe9f7814d9bf7b97ba32a3..eefbfac93dbf134691310bfda01ad5be08d636e4 100644
--- a/forecasts/templates/models/index.html
+++ b/forecasts/templates/models/index.html
@@ -1,22 +1,22 @@
{% extends "base.html" %}
{% comment %}
-
- Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
-
- This file is part of VIPSWeb.
- VIPSWeb is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- VIPSWeb is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
-
+#
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
+#
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
{% endcomment %}
{% load i18n %}
{% block title%}{% trans "Models" %}{%endblock%}
diff --git a/forecasts/templates/models/modelLocalNames.js b/forecasts/templates/models/modelLocalNames.js
index 84556119a50b76c08311162dc6b60dc92a4ed8c2..e1fa3352159a0a8aaa600d99f763bdd1a7e9a957 100644
--- a/forecasts/templates/models/modelLocalNames.js
+++ b/forecasts/templates/models/modelLocalNames.js
@@ -3,17 +3,17 @@
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the Bioforsk Open Source License as published by
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
*
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/forecasts/templatetags/forecast_extras.py b/forecasts/templatetags/forecast_extras.py
index cbe1f2eb292ddcf3b84eb384329ec21f321ff0c0..22cc16b8149fea91905dd0d23a475f90dee87c0a 100644
--- a/forecasts/templatetags/forecast_extras.py
+++ b/forecasts/templatetags/forecast_extras.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
-
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django import template
register = template.Library()
diff --git a/forecasts/urls.py b/forecasts/urls.py
index b9b3fad5976fe945b72540453897d87bec71a691..95d23c86e786b6eaa9896cdbb222015f261f3984 100644
--- a/forecasts/urls.py
+++ b/forecasts/urls.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
-
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.conf.urls import patterns, url
from django.views.decorators.cache import cache_page
diff --git a/forecasts/views.py b/forecasts/views.py
index cfb2b5405cfc0f57b27c1ff302bc807c3b586104..193e442bdfb796254513d45dda45ade7c0dfded2 100644
--- a/forecasts/views.py
+++ b/forecasts/views.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
-
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
# Create your views here.
import json
from decimal import Decimal
diff --git a/messages/admin.py b/messages/admin.py
index d27c1cbbd0c9c201c2a17d7e60adf7310f3402a1..d9345e36765e2cddd6dfa2330da6d9d28094650f 100644
--- a/messages/admin.py
+++ b/messages/admin.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
"""
from django.contrib import admin
diff --git a/messages/locale/bs/LC_MESSAGES/django.po b/messages/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..30691b7a6f020c83ccf9f9d5e2184d2cb67dd59c
--- /dev/null
+++ b/messages/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,40 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VIPS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-08 18:28+0200\n"
+"PO-Revision-Date: 2014-10-10 13:01+0100\n"
+"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.6.9\n"
+
+#: templates/messages/index.html:3 templates/messages/index.html.py:5
+msgid "Messages"
+msgstr "Poruke "
+
+#: templates/messages/index.html:12
+msgid "Publish date"
+msgstr "Datum objave "
+
+#: templates/messages/index.html:13
+msgid "Headline"
+msgstr "Naslov "
+
+#: templates/messages/index.html:14
+msgid "Author"
+msgstr "Autor "
+
+#: templates/messages/index.html:24
+msgid "Details"
+msgstr "Detalji "
diff --git a/messages/locale/hr/LC_MESSAGES/django.po b/messages/locale/hr/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..30691b7a6f020c83ccf9f9d5e2184d2cb67dd59c
--- /dev/null
+++ b/messages/locale/hr/LC_MESSAGES/django.po
@@ -0,0 +1,40 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VIPS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-08 18:28+0200\n"
+"PO-Revision-Date: 2014-10-10 13:01+0100\n"
+"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.6.9\n"
+
+#: templates/messages/index.html:3 templates/messages/index.html.py:5
+msgid "Messages"
+msgstr "Poruke "
+
+#: templates/messages/index.html:12
+msgid "Publish date"
+msgstr "Datum objave "
+
+#: templates/messages/index.html:13
+msgid "Headline"
+msgstr "Naslov "
+
+#: templates/messages/index.html:14
+msgid "Author"
+msgstr "Autor "
+
+#: templates/messages/index.html:24
+msgid "Details"
+msgstr "Detalji "
diff --git a/messages/models.py b/messages/models.py
index 222c063b4f415ac23fc33337f1f469527e388b51..9e7ce52c48b83d9116e576f86e481fbd2163e021 100644
--- a/messages/models.py
+++ b/messages/models.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
import requests
from django.conf import settings
diff --git a/messages/urls.py b/messages/urls.py
index b09fdd0567c3174f5ef3e4e244f84cd07ea987bb..e734cff1fb953b0f966e4c97f82807cc6f57610f 100644
--- a/messages/urls.py
+++ b/messages/urls.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.conf.urls import patterns, url
diff --git a/messages/views.py b/messages/views.py
index 0b2d5f5bea72dfb2fe7cad5b024976d6e0729fe2..3edbfaff48f7fea511f4e62c7c688d638994371e 100644
--- a/messages/views.py
+++ b/messages/views.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.shortcuts import render, get_object_or_404
diff --git a/organisms/locale/bs/LC_MESSAGES/django.po b/organisms/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..246df035f9e10061de95c6adc5f22bd6894356e1
--- /dev/null
+++ b/organisms/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,68 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VIPS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-08 18:20+0200\n"
+"PO-Revision-Date: 2014-10-10 12:59+0100\n"
+"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.6.9\n"
+
+#: templates/base.html:45
+msgid "Toggle navigation"
+msgstr "Prebaci navigaciju "
+
+#: templates/base.html:56
+msgid "Forecasts"
+msgstr "Prognoze "
+
+#: templates/base.html:57 templates/index.html:64
+msgid "Messages"
+msgstr "Poruke "
+
+#: templates/base.html:59
+msgid "Dropdown"
+msgstr "Padajući izbornik "
+
+#: templates/base.html:61
+msgid "Action"
+msgstr "Radnja "
+
+#: templates/base.html:62
+msgid "Another action"
+msgstr "Druga radnja "
+
+#: templates/base.html:63
+msgid "Something else here"
+msgstr "Nešto drugo "
+
+#: templates/base.html:64
+msgid "Separated link"
+msgstr "Odvojeni link "
+
+#: templates/base.html:65
+msgid "One more separated link"
+msgstr "Dodatni odvojeni link "
+
+#: templates/base.html:137
+msgid "This is the default page contents."
+msgstr "Ovo je zadani sadržaj stranice "
+
+#: templates/index.html:22
+msgid "Welcome"
+msgstr "Dobrodošli "
+
+#: templates/index.html:51
+msgid "Crops"
+msgstr "Usjevi "
diff --git a/organisms/locale/hr/LC_MESSAGES/django.po b/organisms/locale/hr/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..246df035f9e10061de95c6adc5f22bd6894356e1
--- /dev/null
+++ b/organisms/locale/hr/LC_MESSAGES/django.po
@@ -0,0 +1,68 @@
+# 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 <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VIPS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-08 18:20+0200\n"
+"PO-Revision-Date: 2014-10-10 12:59+0100\n"
+"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.6.9\n"
+
+#: templates/base.html:45
+msgid "Toggle navigation"
+msgstr "Prebaci navigaciju "
+
+#: templates/base.html:56
+msgid "Forecasts"
+msgstr "Prognoze "
+
+#: templates/base.html:57 templates/index.html:64
+msgid "Messages"
+msgstr "Poruke "
+
+#: templates/base.html:59
+msgid "Dropdown"
+msgstr "Padajući izbornik "
+
+#: templates/base.html:61
+msgid "Action"
+msgstr "Radnja "
+
+#: templates/base.html:62
+msgid "Another action"
+msgstr "Druga radnja "
+
+#: templates/base.html:63
+msgid "Something else here"
+msgstr "Nešto drugo "
+
+#: templates/base.html:64
+msgid "Separated link"
+msgstr "Odvojeni link "
+
+#: templates/base.html:65
+msgid "One more separated link"
+msgstr "Dodatni odvojeni link "
+
+#: templates/base.html:137
+msgid "This is the default page contents."
+msgstr "Ovo je zadani sadržaj stranice "
+
+#: templates/index.html:22
+msgid "Welcome"
+msgstr "Dobrodošli "
+
+#: templates/index.html:51
+msgid "Crops"
+msgstr "Usjevi "
diff --git a/organisms/models.py b/organisms/models.py
index dd4a9a0a00d617e0e4bdbbb993b00138b7928b38..4b656ecfc261aad7be497fd5c7a697f81124bd3a 100644
--- a/organisms/models.py
+++ b/organisms/models.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
import requests
from django.conf import settings
diff --git a/organisms/urls.py b/organisms/urls.py
index a6a352f82f73c5e791ad26b0bcfdbf50d05127c3..652c605fbb7af38277d373f8e2a90dd28976dc9c 100644
--- a/organisms/urls.py
+++ b/organisms/urls.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.conf.urls import patterns, url
diff --git a/organisms/views.py b/organisms/views.py
index 961f111e5cf8dda9e26f7812b57fe24de412ae06..d7c01172cf72269aa909ee046a2f04cfe4760628 100644
--- a/organisms/views.py
+++ b/organisms/views.py
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
from django.shortcuts import render, get_object_or_404
diff --git a/requirements.txt b/requirements.txt
index a9f4a66ebb78e25d0ec9b953c9f5ce3d5503ec67..ba09eec43ce5b7d5f17420e28e3435ac759bc235 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSWeb
#
-# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+#
+# This file is part of VIPSWeb.
+# VIPSWeb is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+#
+# VIPSWeb is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Bioforsk Open Source License for more details.
#
-# VIPSWeb is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+#
# Please add requirements here
# Read docs for how this works: http://www.pip-installer.org/en/latest/cookbook.html