Merge branch 'master' of 192.168.15.97:codeq-problems

Conflicts:
	python/problems/introduction/fahrenheit_to_celsius/sl.py

25 files changed, 29 insertions, 29 deletions

diff --git a/prolog/problems/clp_fd/en.py b/prolog/problems/clp_fd/en.py
index d6b7580..bdfafbc 100644
--- a/prolog/problems/clp_fd/en.py
+++ b/prolog/problems/clp_fd/en.py
@@ -1,2 +1,2 @@
 name = 'CLP(FD)'
-description = ''
+description = 'Constraint Logic Programming paradigm, working with finite domains (FD).'
diff --git a/prolog/problems/clp_fd/sl.py b/prolog/problems/clp_fd/sl.py
index d6b7580..5c1147e 100644
--- a/prolog/problems/clp_fd/sl.py
+++ b/prolog/problems/clp_fd/sl.py
@@ -1,2 +1,2 @@
 name = 'CLP(FD)'
-description = ''
+description = 'Programiranje z omejitvami, delo s končnimi (celoštevilskimi) domenami.'
diff --git a/prolog/problems/clp_r/en.py b/prolog/problems/clp_r/en.py
index 639d9a6..6289bbf 100644
--- a/prolog/problems/clp_r/en.py
+++ b/prolog/problems/clp_r/en.py
@@ -1,2 +1,2 @@
 name = 'CLP(R)'
-description = ''
+description = 'Constraint Logic Programming paradigm, working with real numbers (R).'
diff --git a/prolog/problems/clp_r/sl.py b/prolog/problems/clp_r/sl.py
index 639d9a6..86ff2c9 100644
--- a/prolog/problems/clp_r/sl.py
+++ b/prolog/problems/clp_r/sl.py
@@ -1,2 +1,2 @@
 name = 'CLP(R)'
-description = ''
+description = 'Programiranje z omejitvami, delo z realnimi števili.'
diff --git a/prolog/problems/dcg/en.py b/prolog/problems/dcg/en.py
index 454987c..043a9f5 100644
--- a/prolog/problems/dcg/en.py
+++ b/prolog/problems/dcg/en.py
@@ -1,2 +1,2 @@
 name = 'Definite clause grammars (DCG)'
-description = ''
+description = 'Composing and testing grammars, from simple to quite realistic ones; the basis for compilers.'
diff --git a/prolog/problems/dcg/sl.py b/prolog/problems/dcg/sl.py
index 6a399ca..2e5a381 100644
--- a/prolog/problems/dcg/sl.py
+++ b/prolog/problems/dcg/sl.py
@@ -1,2 +1,2 @@
 name = 'Gramatike (DCG)'
-description = ''
+description = 'Sestavljanje in testiranje gramatik, od preprostih do precej realističnih; podlaga za prevajalnike.'
diff --git a/prolog/problems/denotational_semantics/en.py b/prolog/problems/denotational_semantics/en.py
index 6b3ac64..418b1e7 100644
--- a/prolog/problems/denotational_semantics/en.py
+++ b/prolog/problems/denotational_semantics/en.py
@@ -1,2 +1,2 @@
-name = 'Family relations'
-description = ''
+name = 'Denotational semantics'
+description = 'Adding meaning to grammars, writing a simple compiler for Algol-like programming language.'
diff --git a/prolog/problems/denotational_semantics/sl.py b/prolog/problems/denotational_semantics/sl.py
index f5adadb..d0e8f1e 100644
--- a/prolog/problems/denotational_semantics/sl.py
+++ b/prolog/problems/denotational_semantics/sl.py
@@ -1,2 +1,2 @@
 name = 'Denotacijske semantike'
-description = ''
+description = 'Dodajanje pomena gramatikam, pisanje preprostega prevajalnika za programski jezik algolskega tipa.'
diff --git a/prolog/problems/family_relations/en.py b/prolog/problems/family_relations/en.py
index 18bc313..dd8f6d6 100644
--- a/prolog/problems/family_relations/en.py
+++ b/prolog/problems/family_relations/en.py
@@ -1,2 +1,2 @@
-name = 'Denotational semantics'
-description = ''
+name = 'Family relations'
+description = 'First steps in Prolog, defining rules for various family relations.'
diff --git a/prolog/problems/family_relations/sl.py b/prolog/problems/family_relations/sl.py
index f717912..fafdeef 100644
--- a/prolog/problems/family_relations/sl.py
+++ b/prolog/problems/family_relations/sl.py
@@ -1,2 +1,2 @@
 name = 'Družinske relacije'
-description = ''
+description = 'Prvi koraki v prologu, pisanje pravil za različne družinske relacije.'
diff --git a/prolog/problems/license_plates/en.py b/prolog/problems/license_plates/en.py
index 71b838f..39ee505 100644
--- a/prolog/problems/license_plates/en.py
+++ b/prolog/problems/license_plates/en.py
@@ -1,2 +1,2 @@
 name = 'License plates'
-description = ''
+description = 'A bit larger exercise encompassing working with lists, arithmetic, types in Prolog, composing expressions, negation, and more.'
diff --git a/prolog/problems/license_plates/sl.py b/prolog/problems/license_plates/sl.py
index 047645b..9abbb79 100644
--- a/prolog/problems/license_plates/sl.py
+++ b/prolog/problems/license_plates/sl.py
@@ -1,2 +1,2 @@
 name = 'Registrske tablice'
-description = ''
+description = 'Malo večja naloga, ki obsega delo s seznami, aritmetiko, tipi v prologu, sestavljanju izrazov, negacijo in še čim.'
diff --git a/prolog/problems/lists/en.py b/prolog/problems/lists/en.py
index 1a03130..3306303 100644
--- a/prolog/problems/lists/en.py
+++ b/prolog/problems/lists/en.py
@@ -1,2 +1,2 @@
 name = 'Lists'
-description = ''
+description = 'Working with lists, lots of recursion.'
diff --git a/prolog/problems/lists/sl.py b/prolog/problems/lists/sl.py
index 0d24a36..9b29fff 100644
--- a/prolog/problems/lists/sl.py
+++ b/prolog/problems/lists/sl.py
@@ -1,2 +1,2 @@
 name = 'Seznami'
-description = ''
+description = 'Delo s seznami, poudarek na rekurziji.'
diff --git a/prolog/problems/old_exams/en.py b/prolog/problems/old_exams/en.py
index e33377d..08e1254 100644
--- a/prolog/problems/old_exams/en.py
+++ b/prolog/problems/old_exams/en.py
@@ -1,2 +1,2 @@
 name = 'Past exam exercises'
-description = ''
+description = 'Miscellaneous exercises from past exams, various topics.'
diff --git a/prolog/problems/old_exams/sl.py b/prolog/problems/old_exams/sl.py
index 210e6f9..f9d4e38 100644
--- a/prolog/problems/old_exams/sl.py
+++ b/prolog/problems/old_exams/sl.py
@@ -1,2 +1,2 @@
 name = 'Naloge z izpitov'
-description = ''
+description = 'Naloge s starih izpitov, različne vsebine.'
diff --git a/prolog/problems/other/en.py b/prolog/problems/other/en.py
index a7ca054..e6a147a 100644
--- a/prolog/problems/other/en.py
+++ b/prolog/problems/other/en.py
@@ -1,2 +1,2 @@
 name = 'Miscellaneous'
-description = ''
+description = 'Miscellaneous exercises for practice.'
diff --git a/prolog/problems/other/sl.py b/prolog/problems/other/sl.py
index 07fd915..e108d03 100644
--- a/prolog/problems/other/sl.py
+++ b/prolog/problems/other/sl.py
@@ -1,2 +1,2 @@
 name = 'Razno'
-description = ''
+description = 'Različne naloge za vajo.'
diff --git a/prolog/problems/sets/en.py b/prolog/problems/sets/en.py
index 9745f9f..c27a431 100644
--- a/prolog/problems/sets/en.py
+++ b/prolog/problems/sets/en.py
@@ -1,2 +1,2 @@
 name = 'Sets'
-description = ''
+description = 'Working with sets, represented as lists; negation and cut (!) in Prolog.'
diff --git a/prolog/problems/sets/sl.py b/prolog/problems/sets/sl.py
index e335524..2d593a8 100644
--- a/prolog/problems/sets/sl.py
+++ b/prolog/problems/sets/sl.py
@@ -1,2 +1,2 @@
 name = 'Množice'
-description = ''
+description = 'Delo z množicami predstavljenimi s seznami; negacija in rez (!) v prologu.'
diff --git a/prolog/problems/sorting/en.py b/prolog/problems/sorting/en.py
index 42aaf7d..7b13ff8 100644
--- a/prolog/problems/sorting/en.py
+++ b/prolog/problems/sorting/en.py
@@ -1,2 +1,2 @@
 name = 'Sorting'
-description = ''
+description = 'Implementation of sorting algorithms; lists, arithmetics, recursion.'
diff --git a/prolog/problems/sorting/sl.py b/prolog/problems/sorting/sl.py
index 6937117..48ffbf4 100644
--- a/prolog/problems/sorting/sl.py
+++ b/prolog/problems/sorting/sl.py
@@ -1,2 +1,2 @@
 name = 'Sortiranje'
-description = ''
+description = 'Implementacija sortirnih algoritmov; seznami, aritmetika in rekurzija.'
diff --git a/prolog/problems/trees/en.py b/prolog/problems/trees/en.py
index 5726ed5..125ea54 100644
--- a/prolog/problems/trees/en.py
+++ b/prolog/problems/trees/en.py
@@ -1,2 +1,2 @@
 name = 'Trees'
-description = ''
+description = 'Working with trees; structures in Prolog.'
diff --git a/prolog/problems/trees/sl.py b/prolog/problems/trees/sl.py
index fd13202..db9166a 100644
--- a/prolog/problems/trees/sl.py
+++ b/prolog/problems/trees/sl.py
@@ -1,2 +1,2 @@
 name = 'Drevesa'
-description = ''
+description = 'Delo z drevesi; strukture v prologu.'
diff --git a/python/problems/introduction/ballistics/sl.py b/python/problems/introduction/ballistics/sl.py
index 7c83b1d..b130a19 100644
--- a/python/problems/introduction/ballistics/sl.py
+++ b/python/problems/introduction/ballistics/sl.py
@@ -94,8 +94,8 @@ v = float(input(" ...
 '''],
     'final_hint' : [
         '''\
-<p>Odlično, program deluje pravilno! <br>
-Če želiš izvedeti še kaj več o <a href="https://en.wikipedia.org/wiki/Topology
-">topologiji</a> ... </p>''']
+<p>Odlično, program deluje pravilno!<br>
+Če želiš izvedeti še kaj več o <a href="https://en.wikipedia.org/wiki/Topology">topologiji</a>...</p>
+''']
 
 }