diff --git a/01/01.txt b/01/01.txt index a2573b0..fa4abbe 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Yahuda, ayam, Yesu Almasihuya mwabo aama Yakubu, won wawo Arike Adaa yeri wotyi wu tafi wotiwa ndwa Yesu Kristi; \v 2 Gwa ,myeto ne kato zangzagto ne dauwo wata wo gushi nezaha. -======= -\v 1 Yahuza, a yam Yeso ya aa ma yakubuya mwa, wonǝ wa wau yariwati nda, wan dawawata ɗa ndǝrra Arike Ada, wawa fwati dwa Yeso kǝrǝstiwa.\v 2 Ma fanda kato mayãto ni kato zangzangto nǝ dauwawata, wa kat gushi ɗaza ->>>>>>> ec66fdb23c8796a96b343a6337209ca33a42df59 +\c 1 \v 1 Yahuda, ayam, Yesu Almasihuya mwabo aama Yakubu, won wawo Arike Adaa yeri wotyi wu tafi wotiwa ndwa Yesu Kristi; \v 2 Gwa ,myeto ne kato zangzagto ne dauwo wata wo gushi nezaha. \ No newline at end of file diff --git a/01/title.txt b/01/title.txt index c1cd963..d233d14 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Tanger1 -======= -Tanggǝra 1 ->>>>>>> ec66fdb23c8796a96b343a6337209ca33a42df59 +Tanger1 \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 4166b31..150a5f2 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Yahuda -======= -Jude ->>>>>>> ec66fdb23c8796a96b343a6337209ca33a42df59 +Yahuda \ No newline at end of file diff --git a/manifest.json b/manifest.json index f8c736f..506610c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,17 +1,10 @@ { - "project": { - "id": "jud", - "name": "" - }, - "type": { - "id": "text", - "name": "Text" - }, + "package_version": 7, + "format": "usfm", "generator": { "name": "ts-desktop", "build": "5" }, - "package_version": 7, "target_language": { "name": "Nhanda", "direction": "ltr", @@ -20,24 +13,35 @@ "is_gateway_language": false, "id": "nha" }, - "format": "usfm", + "project": { + "id": "jud", + "name": "Jude" + }, + "type": { + "id": "text", + "name": "Text" + }, "resource": { "id": "reg" }, - "translators": [ - "samari", - "KEFAS Sama'ila." - ], "source_translations": [ { "language_id": "en", "resource_id": "ulb", "checking_level": "3", - "date_modified": 20170329, - "version": "9" + "date_modified": "2017-11-29T00:00:00+00:00", + "version": "12" } ], + "translators": [ + "samari", + "KEFAS Sama'ila.", + "RIF" + ], "finished_chunks": [ + "front-title", + "01-title", + "01-01", "01-03", "01-05", "01-07", @@ -46,7 +50,7 @@ "01-14", "01-17", "01-20", - "01-24", - "01-22" + "01-22", + "01-24" ] } \ No newline at end of file