summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorRobert Zorko <robertz@gurucue.com>2015-10-16 11:28:10 +0200
committerRobert Zorko <robertz@gurucue.com>2015-10-16 11:28:10 +0200
commit8bee58b97d92b476b114c9af4c70b7a43172ad8e (patch)
treee73e6d8337b91675b5151267c3ee9ef28d6aba4a /res
parentdbbaa4c1598601d1ef137af56d63c85761ea3373 (diff)
parent3fa8787e93ddb751c92412662db578aad841f120 (diff)
Merge branch 'master' into layout
Diffstat (limited to 'res')
-rw-r--r--res/en.json3
-rw-r--r--res/sl.json3
2 files changed, 6 insertions, 0 deletions
diff --git a/res/en.json b/res/en.json
index c721548..bde0a98 100644
--- a/res/en.json
+++ b/res/en.json
@@ -1,6 +1,9 @@
{
"language": "Language",
+ "ui_language_title": "Select the UI language.",
"robot_address": "Robot’s IP address",
+ "robot_address_placeholder": "IP address",
+ "robot_address_title": "Set the robot's IPv4 or IPv6 address.",
"problem_list": "Problems",
"python": "Python",
"prolog": "Prolog",
diff --git a/res/sl.json b/res/sl.json
index 7745fd7..17ae22b 100644
--- a/res/sl.json
+++ b/res/sl.json
@@ -1,6 +1,9 @@
{
"language": "Jezik",
+ "ui_language_title": "Izberite jezik uporabniškega vmesnika.",
"robot_address": "Robotov naslov IP",
+ "robot_address_placeholder": "IP naslov",
+ "robot_address_title": "Vnesite IPv4 or IPv6 naslov robota.",
"problem_list": "Naloge",
"python": "Python",
"prolog": "Prolog",