diff --git a/03/01.txt b/03/01.txt index f64b0ec..1acb14d 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1 +1,5 @@ -\v 1 Umoe la ge a ngae abotosi go angae bangene babebeko , la bekondi , Batose , Bagu abesa labetubu belo . \v 2 Atiobea loo lobe a boto , Olemba gehai , amesegele mbeo , bangae a bopolo aboto botubu . \ No newline at end of file +<<<<<<< HEAD +\v 1 Umoe la ge a ngae abotosi go angae bangene babebeko , la bekondi , Batose , Bagu abesa labetubu belo . \v 2 Atiobea loo lobe a boto , Olemba gehai , amesegele mbeo , bangae a bopolo aboto botubu . +======= +V/ 1 Umoela ge a ngae a botosi goa ngae bangene ba bebeko, la bekondi, batose,bangae la besala. V/2 Atiobea loo lobe a boto oemba gehoi a mesegele mbeo, ba ngae a bopolo botubu. +>>>>>>> refs/heads/new diff --git a/03/03.txt b/03/03.txt index e4009c8..5df399f 100644 --- a/03/03.txt +++ b/03/03.txt @@ -1 +1,5 @@ -\v 3 Po esu ambale tombende gee geasina a gengae ligebe , longoana , Olimega , ongala a tama , gelenge gebe , uha goete oili , goete kamo , to gela ne ba ohesu obe la esuambale tobende moowa bamoa obe la obai , \ No newline at end of file +<<<<<<< HEAD +\v 3 Po esu ambale tombende gee geasina a gengae ligebe , longoana , Olimega , ongala a tama , gelenge gebe , uha goete oili , goete kamo , to gela ne ba ohesu obe la esuambale tobende moowa bamoa obe la obai , +======= +V/ 3 Po esu ambale, tombe bileko bia sina tombende a gengaeli gebe, la ngoana,olimega, o djala labesala bebe bilenge bitubu po esu ambale tombende gee gea ina a gengaeli gebe, longoana, olimega, odjala a tama, ge nanga gebe, uha goeteoili, goete kamo, togelane oaambhobe la esu ambale tombende moa ba moa obe laobai. +>>>>>>> refs/heads/new diff --git a/03/04.txt b/03/04.txt index 21b58df..975191d 100644 --- a/03/04.txt +++ b/03/04.txt @@ -1 +1,5 @@ -\v 4 Ango galo , gee ge holo bo mungu bouhesi boaiso la oboto boinde podje Baito boene gelama nde . \v 5 Eu hesendesu , ati poa dje mesala be longene abehelesa , kasi poa ye gelenge ge ngandi yande , alubiama bo obotama mbala djasina , la oyambisa bo oenda boelu . \ No newline at end of file +<<<<<<< HEAD +\v 4 Ango galo , gee ge holo bo mungu bouhesi boaiso la oboto boinde podje Baito boene gelama nde . \v 5 Eu hesendesu , ati poa dje mesala be longene abehelesa , kasi poa ye gelenge ge ngandi yande , alubiama bo obotama mbala djasina , la oyambisa bo oenda boelu . +======= +V/4 Ango galo, gee ge holo bo mungu bauhesi boaiso la oboto boande podje baito boene gela mende. V/5 Euhesendesu, atipua yedje mesala be longene abe halesu, kasi paa ye gelenge ge ngandi yande, a olubia ma bo obotama mbala djaina la oya mbisa bo boenda boelu. +>>>>>>> refs/heads/new diff --git a/03/06.txt b/03/06.txt index fd28db5..0b6a535 100644 --- a/03/06.txt +++ b/03/06.txt @@ -1 +1,5 @@ -\v 6 abolenge gotie djiso la buiye go ndole ye Yesu klisito bouhesi boaiso . \v 7 A gelenge mbo ,touhesame a oboto bwande , toa ngala la geinyele ge baito abango udja ouha bo longo alongo . \ No newline at end of file +<<<<<<< HEAD +\v 6 abolenge gotie djiso la buiye go ndole ye Yesu klisito bouhesi boaiso . \v 7 A gelenge mbo ,touhesame a oboto bwande , toa ngala la geinyele ge baito abango udja ouha bo longo alongo . +======= +V/6 Abobelego gotieiso la buiye go ndole ye Yesu Klisto bouhesi boaiso. V/7 Agelengembo, touhesama a oboto bwande, toangala la geinyelige obange ne balipeta li geyheli ge longo a longo. +>>>>>>> refs/heads/new diff --git a/03/08.txt b/03/08.txt index 3da1912..c95f3e7 100644 --- a/03/08.txt +++ b/03/08.txt @@ -1 +1,5 @@ -\v 8 Lie lio lingae longeme mbo , djelembe mbo bo a nda nei a loe loo , a buina mbo oba imilie go ga Mungu baote oyanga bagwa balo . \ No newline at end of file +<<<<<<< HEAD +\v 8 Lie lio lingae longeme mbo , djelembe mbo bo a nda nei a loe loo , a buina mbo oba imilie go ga Mungu baote oyanga bagwa balo . +======= +V/8 Lie liogi lingae longene mbo, dje lembe mbo andanei a loe loo, a buina mbo oba imiliego ga Mungu baote otanga bagwabalo. +>>>>>>> refs/heads/new diff --git a/03/09.txt b/03/09.txt index 51f8528..12c46a0 100644 --- a/03/09.txt +++ b/03/09.txt @@ -1 +1,5 @@ -\v 9 Leta moa ngoe golola litomba gaa ngae Baito . kasi pea autana Baito tina , obala base go , bepulanyo ,oselanga selenga gotie oimilia . Ainongo mongae loo boa si lamotia litomba . \v 10 Segana gola , moe mongae mbala dje pelo la edjele olubesae , oga panga oseganisa , \v 11 La olubambo gelenge ge oho boto akikoga , la ende ela basumu , la endee kweisama gelaene . \ No newline at end of file +<<<<<<< HEAD +\v 9 Leta moa ngoe golola litomba gaa ngae Baito . kasi pea autana Baito tina , obala base go , bepulanyo ,oselanga selenga gotie oimilia . Ainongo mongae loo boa si lamotia litomba . \v 10 Segana gola , moe mongae mbala dje pelo la edjele olubesae , oga panga oseganisa , \v 11 La olubambo gelenge ge oho boto akikoga , la ende ela basumu , la endee kweisama gelaene . +======= +V/9 Leta mwangae go lola litomba ga baito kasi bea olutama botia tina, obala nabasego, be pu la nyo, obesiana gotie oimilia. Aisnongo mongae loo boasila motia litomba. V/10 Segana ago, anoe mongae mbala djepelo la edjele olubesae, ogapanga osenganisa. V/11 La olubambo gelenge ge hototoa kikoga la ende ela basumu, la endee kweisama go laene. +>>>>>>> refs/heads/new diff --git a/03/12.txt b/03/12.txt index 849db69..522d974 100644 --- a/03/12.txt +++ b/03/12.txt @@ -1 +1,5 @@ -\v 12 Geleko geango tomemi artemosi too tisike , ela saga boye goo saana ai go Nikopolisi ; Ago ndango gelanesei la oetisa gee . \v 13 Udja la limemia poa dje loendo loe la Zenase , Boekesi bo bebeko , la Apolo , mogelenge mbo gea ge moa ge to tiala . \ No newline at end of file +<<<<<<< HEAD +\v 12 Geleko geango tomemi artemosi too tisike , ela saga boye goo saana ai go Nikopolisi ; Ago ndango gelanesei la oetisa gee . \v 13 Udja la limemia poa dje loendo loe la Zenase , Boekesi bo bebeko , la Apolo , mogelenge mbo gea ge moa ge to tiala . +======= +V/12 Geleko gea ngo to menu Artemosi too tisike, ela soga bodje goo saana aigo NIKOPOLISI, Ago nda ngo gela ne sei la oetisagee. V/13 Uya la limemia po a djeloe ndo loe lo Zenase, Boekesi ba bebeko, la Apolo, mgelinge mbo gea ngo gemoa ge totiala. +>>>>>>> refs/heads/new diff --git a/03/14.txt b/03/14.txt index f07d359..bcbb53e 100644 --- a/03/14.txt +++ b/03/14.txt @@ -1 +1,5 @@ -\v 14 Mogelane nde mbo obaiso baete oela bagwa balo , Imbo toenga nese kamo isika , Ambo batongaa lotsha ota tuma . \ No newline at end of file +<<<<<<< HEAD +\v 14 Mogelane nde mbo obaiso baete oela bagwa balo , Imbo toenga nese kamo isika , Ambo batongaa lotsha ota tuma . +======= +V/14 Mogelane ndembo abaiso baote oela bagwa balo, imbo toenga nese kamo iogiogi, ambo batongaa lotsha ota tuma. V/15 Batubu a bangae laibabee nu mbote paa mbote la abalembesu goe ete oimilia sidja lipea li Mungu lingae aino batubu. +>>>>>>> refs/heads/new diff --git a/manifest.json b/manifest.json index 0d2bd71..3cf4ed3 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"tit","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Botoki","direction":"ltr","anglicized_name":"Botoki","region":"Africa","is_gateway_language":false,"id":"kmw-x-botoki"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin-azaza"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["front-title","01-title","01-01","01-04","01-06","01-08","01-10","01-12","01-15","03-title","03-01","03-03","03-04","03-06","03-09","03-08","03-12","03-14","03-15","02-title","02-01","02-03","02-06","02-09","02-11","02-14","02-15"]} \ No newline at end of file +{"project":{"id":"tit","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Botoki","direction":"ltr","anglicized_name":"Botoki","region":"Africa","is_gateway_language":false,"id":"kmw-x-botoki"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin-azaza","FAUSTIN AZAZA"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["front-title","01-title","01-01","01-04","01-06","01-08","01-10","01-12","01-15","03-title","03-01","03-03","03-04","03-06","03-09","03-08","03-12","03-14","03-15","02-title","02-01","02-03","02-06","02-09","02-11","02-14","02-15"]} \ No newline at end of file