Thu Aug 22 2019 17:06:01 GMT-0700 (Pacific Daylight Time)

This commit is contained in:
tsDesktop 2019-08-22 17:06:02 -07:00
parent 5d3cc39b1f
commit 0be839ebc0
2 changed files with 29 additions and 31 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD \c 1 \v 1 Nnaaru tuana hama ngiau mmataivoo vau suavaki, Anutuuqo ngiau mmatai vaatama mmuakiaa mminai yauvai immakeravai. \v 2 Haama voo mminnaa vovootaudu, heenaa pinaivoo mmuakia mmatai Vaa rummuaa apukioo vairavai. Vauduu nnoorivoo ivaa aakiaivaki vairavai.
\v 1 Nnaaru tuana hama ngiau mmataivoo vau suavaki, Anutuuqo ngiau mmatai vaatama mmuakiaa mminai yauvai immakeravai. \v 2 Haama voo mminnaa vovootaudu, heenaa pinaivoo mmuakia mmatai Vaa rummuaa apukioo vairavai. Vauduu nnoorivoo ivaa aakiaivaki vairavai.
=======
\v 1 Kioo Anutuuqo nuruanna tunoo, faii immaapuyaa mmataharaa sidinaidiyaa mmuakia mmata arau suruaakuaravairee tirarai. \v 2 Faii mmukia rasingiammaa hataumakii rarianai koyiaa rariayaa faii ngiiyara atukiararai. Ii yauraa Anutuqonoo ngimmiyaurai.
>>>>>>> 01074aa44822bf506c5c069416e66eb40547e96b

View File

@ -1,17 +1,10 @@
{ {
"project": { "package_version": 7,
"id": "gen", "format": "usfm",
"name": ""
},
"type": {
"id": "text",
"name": "Text"
},
"generator": { "generator": {
"name": "ts-desktop", "name": "ts-desktop",
"build": "132" "build": "132"
}, },
"package_version": 7,
"target_language": { "target_language": {
"name": "Waffa", "name": "Waffa",
"direction": "ltr", "direction": "ltr",
@ -20,25 +13,34 @@
"is_gateway_language": false, "is_gateway_language": false,
"id": "waj" "id": "waj"
}, },
"format": "usfm", "project": {
"id": "gen",
"name": "Genesis"
},
"type": {
"id": "text",
"name": "Text"
},
"resource": { "resource": {
"id": "reg" "id": "reg"
}, },
"translators": [
"waffa 1",
"waffa 2"
],
"source_translations": [ "source_translations": [
{ {
"language_id": "en", "language_id": "en",
"resource_id": "ulb", "resource_id": "ulb",
"checking_level": "3", "checking_level": "3",
"date_modified": 20170329, "date_modified": "2017-11-29T00:00:00+00:00",
"version": "9" "version": "12"
} }
], ],
"translators": [
"waffa 1",
"waffa 2",
"PJenkins"
],
"finished_chunks": [ "finished_chunks": [
"01-title", "01-title",
"01-01",
"01-03", "01-03",
"01-06", "01-06",
"01-09", "01-09",
@ -52,11 +54,11 @@
"01-28", "01-28",
"01-30", "01-30",
"02-title", "02-title",
"02-01",
"02-04", "02-04",
"02-07", "02-07",
"02-11",
"02-01",
"02-09", "02-09",
"02-11",
"02-13", "02-13",
"02-15", "02-15",
"02-18", "02-18",
@ -80,12 +82,13 @@
"04-10", "04-10",
"04-13", "04-13",
"04-16", "04-16",
"04-18",
"04-20", "04-20",
"04-23", "04-23",
"04-18",
"04-25", "04-25",
"05-title", "05-title",
"05-01", "05-01",
"05-03",
"05-06", "05-06",
"05-09", "05-09",
"05-12", "05-12",
@ -106,10 +109,9 @@
"06-13", "06-13",
"06-16", "06-16",
"06-18", "06-18",
"07-title",
"06-20", "06-20",
"07-title",
"08-title", "08-title",
"05-03",
"09-title", "09-title",
"09-01", "09-01",
"09-03", "09-03",
@ -161,13 +163,16 @@
"12-10", "12-10",
"12-14", "12-14",
"12-17", "12-17",
"13-title",
"13-01", "13-01",
"13-03", "13-03",
"13-05", "13-05",
"13-08", "13-08",
"13-12",
"13-16",
"13-10", "13-10",
"13-12",
"13-14",
"13-16",
"14-title",
"14-01", "14-01",
"14-03", "14-03",
"14-07", "14-07",
@ -176,8 +181,6 @@
"14-15", "14-15",
"14-17", "14-17",
"14-19", "14-19",
"13-title",
"14-title",
"14-21", "14-21",
"15-title", "15-title",
"15-01", "15-01",
@ -187,7 +190,6 @@
"15-12", "15-12",
"15-14", "15-14",
"15-17", "15-17",
"13-14",
"16-title", "16-title",
"16-01" "16-01"
] ]