Merge branch 'master' into api-1.1

pull/1/head
Pål Jørgensen 2014-04-14 13:33:13 +02:00
commit 7207049c2c
4 changed files with 8 additions and 8 deletions

View File

@ -98,7 +98,7 @@
}, },
{ {
"label": "Kommentar ved bestått", "label": "Kommentar ved bestått",
"default": "Du presterte meget godt!", "default": "Du presterte godt!",
"description": "Denne kommentaren vises dersom brukeren har bestått spørsmålssettet." "description": "Denne kommentaren vises dersom brukeren har bestått spørsmålssettet."
}, },
{ {
@ -108,7 +108,7 @@
}, },
{ {
"label": "Kommentar ved ikke bestått", "label": "Kommentar ved ikke bestått",
"default": "Dette gikk ikke så bra. Prøv igjen!", "default": "Ikke bestått. Prøv igjen!",
"description": "Denne kommentaren vises dersom brukeren ikke har bestått spørsmålssettet." "description": "Denne kommentaren vises dersom brukeren ikke har bestått spørsmålssettet."
}, },
{ {

View File

@ -108,7 +108,7 @@
}, },
{ {
"label": "Kommentar ved ikkje bestått", "label": "Kommentar ved ikkje bestått",
"default": "Dette gikk ikkje så bra. Prøv igjen!", "default": "Dette er litt mange feil her. Prøv igjen!",
"description": "Denne kommentaren vises dersom brukaren ikkje har bestått spørsmålssettet." "description": "Denne kommentaren vises dersom brukaren ikkje har bestått spørsmålssettet."
}, },
{ {

View File

@ -3,7 +3,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 0, "minorVersion": 0,
"patchVersion": 46, "patchVersion": 47,
"runnable": 1, "runnable": 1,
"fullscreen": 0, "fullscreen": 0,
"machineName": "H5P.QuestionSet", "machineName": "H5P.QuestionSet",

View File

@ -27,7 +27,7 @@
"name": "passPercentage", "name": "passPercentage",
"type": "number", "type": "number",
"label": "Pass percentage", "label": "Pass percentage",
"description": "Percentage of total score required for passing the quiz.", "description": "Percentage of Total score required for passing the quiz.",
"min": 0, "min": 0,
"max": 100, "max": 100,
"step": 1, "step": 1,
@ -164,7 +164,7 @@
"name": "scoreString", "name": "scoreString",
"type": "text", "type": "text",
"label": "Score display text", "label": "Score display text",
"description": "Text used to display total user score. \"@score\" will be replaced by calculated score, \"@total\" will be replaced by maximum possible score. ", "description": "Text used to display Total user score. \"@score\" will be replaced by calculated score, \"@total\" will be replaced by maximum possible score. ",
"default": "You got @score points of @total possible.", "default": "You got @score points of @total possible.",
"optional": true "optional": true
}, },
@ -201,7 +201,7 @@
"name": "failGreeting", "name": "failGreeting",
"type": "text", "type": "text",
"label": "Quiz failed title", "label": "Quiz failed title",
"default": "Oh, no!", "default": "You did not pass this time.",
"optional": true, "optional": true,
"description": "This text will be displayed above the score if the user has failed the quiz.", "description": "This text will be displayed above the score if the user has failed the quiz.",
"tags": [ "tags": [
@ -214,7 +214,7 @@
"type": "text", "type": "text",
"widget": "html", "widget": "html",
"label": "Failed comment", "label": "Failed comment",
"default": "This didn't go so well.", "default": "Have another try!",
"optional": true, "optional": true,
"description": "This comment will be displayed after the score if the user has failed the quiz.", "description": "This comment will be displayed after the score if the user has failed the quiz.",
"tags": [ "tags": [