diff options
| author | Aleš Smodiš <aless@guru.si> | 2015-12-15 11:30:19 +0100 |
|---|---|---|
| committer | Aleš Smodiš <aless@guru.si> | 2015-12-15 11:30:19 +0100 |
| commit | ed62d492323011741027c9d79973ccd30b4b0494 (patch) | |
| tree | 26121de183f0f2019857581198b4e31a9ede5456 /res/en.json | |
| parent | 13c8be3d82350082093df8cd65771f09fcb83c54 (diff) | |
| parent | 7de6dca9112d292803b801e0d370c45b0ca0eb13 (diff) | |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Conflicts:
js/codeq/navigation.js
Diffstat (limited to 'res/en.json')
| -rw-r--r-- | res/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/en.json b/res/en.json index 1fcb894..65d68bc 100644 --- a/res/en.json +++ b/res/en.json @@ -67,5 +67,5 @@ "upgrade_to_aai_no_button": "No, make new", "upgrade_to_aai_yes_button": "Yes, upgrade to AAI", "about": "About", - "about_html" : "<p>CodeQ™ is the ...<div class=\"about-logos\"><div style=\"width: 29%;\"><img src=\"res/fri_logo.png\"></div><div class=\"vertical-line\"></div><div style=\"width: 29%;\"><img src=\"res/ai_lab_logo.png\"></div></div><hr><p>Programming by Guru Ltd, Ljubljana, Slovenia. Design by Loni DBS Ltd, Ljubljana, Slovenia.</p><hr></p>The project was co-funded by European Regional Development Fund and Slovenian Ministry of Education, Science, and Sport.<p></p><div class=\"about-logos\"><div style=\"width: 45%;\"><img src=\"res/nalozba_v_vaso_prihodnost.png\" style=\"max-height: 80%;max-width: 80%;\"></div><div class=\"vertical-line\"></div><div style=\"width: 45%;\"><img src=\"res/MIZS_slo.png\" style=\"max-height: 60%;max-width: 60%;\"></div></div><hr><h3>Contact</h3><p>Aleksander Sadikov, PhD, project leader.</p><hr><h3>Minimal requirements</h3><p>Android: version 3.1, iOS: version 5, Windows Phone: version 8</p>" + "about_html" : "<p>CodeQ™ is an e-service and a mobile app for teaching programming. The application enables the user to work on his or her own by solving a number of carefully prepared programming exercises and by guiding the user with automatically generated hints and test. ...<div class=\"about-logos\"><div style=\"width: 29%;\"><img src=\"res/fri_logo.png\"></div><div class=\"vertical-line\"></div><div style=\"width: 29%;\"><img src=\"res/ai_lab_logo.png\"></div></div><hr></p>The project was co-funded by European Regional Development Fund and Slovenian Ministry of Education, Science, and Sport.<p></p><div class=\"about-logos\"><div style=\"width: 45%;\"><img src=\"res/nalozba_v_vaso_prihodnost.png\" style=\"max-height: 80%;max-width: 80%;\"></div><div class=\"vertical-line\"></div><div style=\"width: 45%;\"><img src=\"res/MIZS_slo.png\" style=\"max-height: 60%;max-width: 60%;\"></div></div><hr><h3>Contact</h3><p>Aleksander Sadikov, PhD, project leader.</p><hr><h3>Mobile applications - minimum requirements</h3><p>Android: version 3.1, iOS: version 5, Windows Phone: version 8</p><hr><p>Programming by Guru Ltd, Ljubljana, Slovenia.</p>" } |