Fix broken ar.json language file

pull/30/head^2
Frode Petterson 2017-09-26 11:48:45 +02:00
parent 8be0616e07
commit 6f62cf9da0
1 changed files with 5 additions and 81 deletions

View File

@ -1,7 +1,6 @@
{ {
"semantics":[ "semantics": [
{ {
<<<<<<< HEAD
"widgets": [ "widgets": [
{ {
"label": "Default" "label": "Default"
@ -12,23 +11,10 @@
"field": { "field": {
"label": "البطاقة", "label": "البطاقة",
"fields": [ "fields": [
=======
"widgets":[
{
"label":"Default"
}
],
"label":"البطاقات",
"entity":"بطاقة",
"field":{
"label":"البطاقة",
"fields":[
>>>>>>> master
{ {
"label":"الصورة" "label": "الصورة"
}, },
{ {
<<<<<<< HEAD
"label": "Matching Image", "label": "Matching Image",
"description": "An optional image to match against instead of using two cards with the same image." "description": "An optional image to match against instead of using two cards with the same image."
}, },
@ -43,20 +29,11 @@
{ {
"label": "Description", "label": "Description",
"description": "An optional short text that will pop up once the two matching cards are found." "description": "An optional short text that will pop up once the two matching cards are found."
=======
"label":"Matching Image",
"description":"An optional image to match against instead of using two cards with the same image."
},
{
"label":"الوصف",
"description":"نص قصير يتم عرضه مرة واحدة علي اثنين من البطاقات متساوية"
>>>>>>> master
} }
] ]
} }
}, },
{ {
<<<<<<< HEAD
"label": "Behavioural settings", "label": "Behavioural settings",
"description": "These options will let you control how the game behaves.", "description": "These options will let you control how the game behaves.",
"fields": [ "fields": [
@ -70,26 +47,10 @@
}, },
{ {
"label": "Add button for retrying when the game is over" "label": "Add button for retrying when the game is over"
=======
"label":"Behavioural settings",
"description":"These options will let you control how the game behaves.",
"fields":[
{
"label":"Position the cards in a square",
"description":"Will try to match the number of columns and rows when laying out the cards. Afterward, the cards will be scaled to fit the container."
},
{
"label":"Number of cards to use",
"description":"Setting this to a number greater than 2 will make the game pick random cards from the list of cards."
},
{
"label":"Add button for retrying when the game is over"
>>>>>>> master
} }
] ]
}, },
{ {
<<<<<<< HEAD
"label": "Look and feel", "label": "Look and feel",
"description": "Control the visuals of the game.", "description": "Control the visuals of the game.",
"fields": [ "fields": [
@ -101,30 +62,13 @@
{ {
"label": "Card Back", "label": "Card Back",
"description": "Use a custom back for your cards." "description": "Use a custom back for your cards."
=======
"label":"Look and feel",
"description":"Control the visuals of the game.",
"fields":[
{
"label":"Theme Color",
"description":"Choose a color to create a theme for your card game.",
"default":"#909090",
"spectrum":{
}
},
{
"label":"Card Back",
"description":"Use a custom back for your cards."
>>>>>>> master
} }
] ]
}, },
{ {
"label":"الأقلمة", "label": "الأقلمة",
"fields":[ "fields": [
{ {
<<<<<<< HEAD
"label": "نص تدوير البطاقة", "label": "نص تدوير البطاقة",
"default": "Card turns" "default": "Card turns"
}, },
@ -163,26 +107,6 @@
{ {
"label": "Card matched label", "label": "Card matched label",
"default": "Match found." "default": "Match found."
=======
"label":"نص تدوير البطاقة",
"default":"Card turns"
},
{
"label":"نص التوقيت الزمني",
"default":"Time spent"
},
{
"label":"نص الملاحظات",
"default":"Good work!"
},
{
"label":"Try again button text",
"default":"Try again?"
},
{
"label":"Close button label",
"default":"Close"
>>>>>>> master
} }
] ]
} }