diff --git a/01/01.txt b/01/01.txt index d8d066a..524c202 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Bulus, ayem Arige ya ne ancimu Yesu Almasihu ya, ndwã gǝna wawo Arige tafodiya nǝ maa jirimsa wo kadi gegege nǝ jirimsǝ Arige. \v 2 Wawa ɗeda mbwa udun ɗimwa fǝka peku bodiyewa, Arige kīme vazza shemɗewa wawo tami alkalwasǝ diga kadakada. \v 3 Ɗeɗa keza gegege akī gano wiwi Lau kiyo gano Arige wo Anainaya cima mwa Arige an peku do akinaya. -======= -\c 1 \v 1 Bulus nge nga ki mbwa nagiwa no mbwa ɗauɗau wa . \v 2 Mulan ogunu kriza íwan mwa íhi wowo íwan mbi buha. An nkalsi mwa juimsi no wan na jirimisi da dawowi no bayi. \v 3 Fanda mwa ogunu Tina was mwa lhi wazo ɗa gusto wozo íwan Rahim ɗere. Wun kad Yama wan mbi be sure we we mbizi ɓuha. ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\c 1 \v 1 Bulus, ayem Arige ya ne ancimu Yesu Almasihu ya, ndwã gǝna wawo Arige tafodiya nǝ maa jirimsa wo kadi gegege nǝ jirimsǝ Arige. \v 2 Wawa ɗeda mbwa udun ɗimwa fǝka peku bodiyewa, Arige kīme vazza shemɗewa wawo tami alkalwasǝ diga kadakada. \v 3 Ɗeɗa keza gegege akī gano wiwi Lau kiyo gano Arige wo Anainaya cima mwa Arige an peku do akinaya. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index fa20302..17e56d2 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 wone Titus ha , Aa nji ɗeɗa najirimsǝ ndo. ɓwhadima nǝ kado zangzangdo diga na Arige adajiyenji nǝ Yesu Almasihu ye pui ndaya. \v 5 Ndwa wada mina sheɗen ɗeda karinta ndwã me nga zaune mbwa ɓwaɗewa nga taf kabaza ɗeda con nǝ khīya yīwo -======= -\v 4 Nda ki was we tona wawo mamakalo suzire wa ma mbizi wa dau kra wozo no mbwa wozo. \v 5 Wa wewad wa kad wan mbiza no wan sukzi wsa wa, wan mwa sudo ziwozo no wan na Gusto kra wozo wa wanda nda Mara Rike tam wanda tan wa dasurmùre. ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\v 4 wone Titus ha , Aa nji ɗeɗa najirimsǝ ndo. ɓwhadima nǝ kado zangzangdo diga na Arige adajiyenji nǝ Yesu Almasihu ye pui ndaya. \v 5 Ndwa wada mina sheɗen ɗeda karinta ndwã me nga zaune mbwa ɓwaɗewa nga taf kabaza ɗeda con nǝ khīya yīwo \ No newline at end of file diff --git a/01/06.txt b/01/06.txt index db9ed03..fb1c083 100644 --- a/01/06.txt +++ b/01/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Akaba kadime ama shemnǝ mbi suwuyi an acen Fadi nǝ mba in hankasǝ wawoh u khī yõdi mbug fikiye mbwa uma kennǝ hankalsǝ. \v 7 Kadin me I dole ye gishi awaiyeya ama shemnu mbi suwuyi ye an dau walalaye an gbesǝ a beyi mbeza ye, dauyi dunda ye dauyi boso ye a dauyi ihī ye. -======= -\v 6 Fika fanda mwa ki mba kra wa rad wan sukzi ɓuha. \v 7 kula lomin Pai ngashi dihiwayi mbi virgo mbi Bulaida cinima. Ma ngi we bula Tina Mango ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\v 6 Akaba kadime ama shemnǝ mbi suwuyi an acen Fadi nǝ mba in hankasǝ wawoh u khī yõdi mbug fikiye mbwa uma kennǝ hankalsǝ. \v 7 Kadin me I dole ye gishi awaiyeya ama shemnu mbi suwuyi ye an dau walalaye an gbesǝ a beyi mbeza ye, dauyi dunda ye dauyi boso ye a dauyi ihī ye. \ No newline at end of file diff --git a/01/08.txt b/01/08.txt index 5e54fb5..8d8e1d1 100644 --- a/01/08.txt +++ b/01/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Amma wodo ma nǝ Kono gǝna abazi bhi ɓwhã, an dim mbiza bai ya tama, tam mbiza gegge , ɗegɗeg mwa an mwaihi. \v 9 Ya kad me i an gano jiremsǝ wowū virgi ndaya, ndwame aka mä ya kug aboza de ya weyoda oda mbi mbiɓuha nǝ ya wawo mbishadiya. -======= -\v 8 We cimita zan zau mbo ma no surmure hinsseno wantano magawa ni Mara rike wuka be luwakara. Nda wuka da mbi haso fika tare. \v 9 Yama Dan gurire fika fanda was we wad na jirimisi wa ɓuha Pa wa ta haha goso mbiza Da da ko mbi pad. ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\v 8 Amma wodo ma nǝ Kono gǝna abazi bhi ɓwhã, an dim mbiza bai ya tama, tam mbiza gegge , ɗegɗeg mwa an mwaihi. \v 9 Ya kad me i an gano jiremsǝ wowū virgi ndaya, ndwame aka mä ya kug aboza de ya weyoda oda mbi mbiɓuha nǝ ya wawo mbishadiya. \ No newline at end of file diff --git a/01/10.txt b/01/10.txt index 292fdfb..0de6daa 100644 --- a/01/10.txt +++ b/01/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 ndwame gǝna kǝn dem un kpangatudo,vazza nǝ un zaã gǝna wawo Kono Arige ya. \v 11 Kadin me nda zawoda udun gihi duwozade Lau virgo gǝna hadiihi lokaya ma udun virgeye wa. -======= -\v 10 Wa Dan gurire fika fanda was we wad bona jirimisi wa buba. \v 11 Pa wata haha rike goso mbi za da da ko mbi pad. Pa dawapike wa fill agina mnin. ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\v 10 ndwame gǝna kǝn dem un kpangatudo,vazza nǝ un zaã gǝna wawo Kono Arige ya. \v 11 Kadin me nda zawoda udun gihi duwozade Lau virgo gǝna hadiihi lokaya ma udun virgeye wa. \ No newline at end of file diff --git a/01/12.txt b/01/12.txt index 8bb7377..111d8b0 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 An biyo Fida Arige ya wodo Fadi ɗeda oda akī me ," Kirawa iwun vazǝna ko gamin, mba nbanama hãsya nǝ un Zho hãs. \v 13 Gano sa i jirimsǝ, ndefada zugode dau co uka ned ɗeda najirimsǝ ngbangngbang. \v 14 Ngan ci hankalsǝ wayi fika fifiya Yahudawa ye nǝ wittah gǝna wawodin pede jirimsǝ ye. -======= -\v 12 An we nda mi nda mbi se mbo sen daurewa hi Wasa ɗa Ginariya. Arike a we wad Kato dambi ɓuha da itri wa arike odeda Ginariya Sawa ndi de wa. \v 13 Da yake dun Gwã nda kon Ginariya wa ndin gwã wa, wo kezi mango adaje nike Pa an puru nda. ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\v 12 An biyo Fida Arige ya wodo Fadi ɗeda oda akī me ," Kirawa iwun vazǝna ko gamin, mba nbanama hãsya nǝ un Zho hãs. \v 13 Gano sa i jirimsǝ, ndefada zugode dau co uka ned ɗeda najirimsǝ ngbangngbang. \v 14 Ngan ci hankalsǝ wayi fika fifiya Yahudawa ye nǝ wittah gǝna wawodin pede jirimsǝ ye. \ No newline at end of file diff --git a/01/15.txt b/01/15.txt index 7f3bf40..d25f2ed 100644 --- a/01/15.txt +++ b/01/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Ndwa wawo ɗegɗegya, mbiza kǝm ɗegɗeg, wawo nai jirimsǝ wa wu Shem ɗegɗeg ye mbi dimzoze nǝ gufuzoze kǝm shem dawdawye. \v 16 wudin khime umaã Arigen Amma u mbisadin ɗeda shikewodon , un mbisha aihi, un zehīndo kwalme wa nauda cinama ɓuhago. -======= -\v 15 Fika wawo Wu na sin pengpengto ko ímbi Lau wotoni pengpeng mbeyi. Pa wawo masen ni pengpeng torewa wuma sen no ma jirinsire, ko mbi ɓuha masen pengpengto ɗa gufo so wato ni sukzi woto Wu gud ɗen.\v 16 Wun ke Wu ma rike Pa mashi magawo da gufo zi wato ni coming so wore Wu gan mbi byakaton wawo Wu ma se no na gustore, Wu ma waci wad Da wan come Arike. ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\v 15 Ndwa wawo ɗegɗegya, mbiza kǝm ɗegɗeg, wawo nai jirimsǝ wa wu Shem ɗegɗeg ye mbi dimzoze nǝ gufuzoze kǝm shem dawdawye. \v 16 wudin khime umaã Arigen Amma u mbisadin ɗeda shikewodon , un mbisha aihi, un zehīndo kwalme wa nauda cinama ɓuhago. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 5893b76..f1d31a9 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Amma, nge gan gano nǝ jirimsa co udauyiwa . \v 2 Virgi kabaza wado mwa ihiwozo , un hankalsǝ, un ɗimo mbiza, un najirimsǝ, ɗeda dau awada nǝ gbesǝ. -======= -\v 1 No Bullus a yam ma rike ya. Wa wautafi watiwa Yeah Almasihu ɗeɗa jirinashi wa wo tafi watiwu í gna rikewa no ma jirima ɗeɗa bida rike wa.\v 2 Wa wâ da wan dina piku waka butrewa, a gan mitakin dá kezi wun won wo nɗa. ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\c 2 \v 1 No Bullus a yam ma rike ya. Wa wautafi watiwa Yeah Almasihu ɗeɗa jirinashi wa wo tafi watiwu í gna rikewa no ma jirima ɗeɗa bida rike wa. \v 2 Wa wâ da wan dina piku waka butrewa, a gan mitakin dá kezi wun won wo nɗa. \ No newline at end of file diff --git a/02/03.txt b/02/03.txt index ce98da9..7e567a4 100644 --- a/02/03.txt +++ b/02/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 \v 4 \v 5 Fada mwa kabaza tona wado nah gishido ɗeda hankalsǝ wado, wado mbe mbale un virgi gǝna mbǝza ɗauɗau ya. ndwa me so virgi mba tonah nǝ mbimaza odo ngag udun daw kǝra wozo nǝ mba wodo. odo mwhãloda aci odo ngag un mbid -======= -\v 3 Da kezi a dawa gǝna mar rǝkewa. Kǝnatamwa nda wa rike pura ndawa. Bhatima.\v 4 Ngge tituc a jirimiya ɗeɗa na jirimisi mayaya to no kato sang zante wo na rike. Adaje Almasihu Yeah an puru ndawa.\v 5 íwanda tamzo pana setɗa karita nda nga zuk mbi bud derewa nga ci ogunu ɗa wur so guishi. Gushi hinse Nikita. ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +\v 3 Da kezi a dawa gǝna mar rǝkewa. Kǝnatamwa nda wa rike pura ndawa. Bhatima. \v 4 Ngge tituc a jirimiya ɗeɗa na jirimisi mayaya to no kato sang zante wo na rike. Adaje Almasihu Yeah an puru ndawa. \v 5 íwanda tamzo pana setɗa karita nda nga zuk mbi bud derewa nga ci ogunu ɗa wur so guishi. Gushi hinse Nikita. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 7745e9b..c2260ed 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Titus -======= -Titus 1 ->>>>>>> 28da7a905cb8ebd3b82f59f7fd3a97f17ee801b0 +Titus \ No newline at end of file diff --git a/manifest.json b/manifest.json index e7931e1..ee1e20a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,17 +1,10 @@ { - "project": { - "id": "tit", - "name": "" - }, - "type": { - "id": "text", - "name": "Text" - }, + "package_version": 7, + "format": "usfm", "generator": { "name": "ts-desktop", "build": "5" }, - "package_version": 7, "target_language": { "name": "Mboi", "direction": "ltr", @@ -20,27 +13,45 @@ "is_gateway_language": false, "id": "moi" }, - "format": "usfm", + "project": { + "id": "tit", + "name": "Titus" + }, + "type": { + "id": "text", + "name": "Text" + }, "resource": { "id": "reg" }, - "translators": [ - "Kanashi Iliya", - "Bunjock Silas", - "Idi" - ], "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": [ + "Kanashi Iliya", + "Bunjock Silas", + "Idi", + "RIF" + ], "finished_chunks": [ - "02-title", + "front-title", "01-title", + "01-01", + "01-04", + "01-06", + "01-08", + "01-10", + "01-12", + "01-15", + "02-title", + "02-01", + "02-03", "02-06", "02-09", "02-11", @@ -48,23 +59,12 @@ "02-15", "03-title", "03-01", - "03-03", "03-04", "03-06", "03-08", "03-09", "03-12", "03-14", - "03-15", - "01-01", - "01-04", - "01-06", - "01-08", - "01-10", - "01-12", - "01-14", - "02-01", - "02-03", - "01-15" + "03-15" ] } \ No newline at end of file