From 9c3dc0250cc6288cfdfd47f79d8ba82cd3b5d3fc Mon Sep 17 00:00:00 2001 From: faustin_azaza <> Date: Thu, 12 Dec 2019 04:19:40 -0500 Subject: [PATCH] auto save --- 14/01.txt | 5 ----- 14/03.txt | 4 ---- 14/06.txt | 4 ---- 14/08.txt | 4 ---- 14/10.txt | 4 ---- 14/13.txt | 4 ---- 14/15.txt | 4 ---- 14/16.txt | 5 ----- 14/19.txt | 4 ---- 27/01.txt | 4 ---- 27/03.txt | 4 ---- 27/06.txt | 4 ---- 27/09.txt | 4 ---- 27/11.txt | 4 ---- 27/15.txt | 4 ---- 27/17.txt | 4 ---- 27/20.txt | 4 ---- 27/23.txt | 4 ---- 27/25.txt | 4 ---- 27/27.txt | 4 ---- 27/30.txt | 4 ---- 27/32.txt | 4 ---- 27/35.txt | 4 ---- 27/38.txt | 4 ---- 27/41.txt | 4 ---- 27/43.txt | 4 ---- manifest.json | 2 +- 27 files changed, 1 insertion(+), 107 deletions(-) diff --git a/14/01.txt b/14/01.txt index b0b5b14..de4d7f0 100644 --- a/14/01.txt +++ b/14/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD \v 1 Saa yeya mfalme, Herode utenekeza mianda ya Yesu. \v 2 Yuwa zeli ku bantu baake''yewa ni yohana wa ku batiza bantu afufukaa katika batu bafile, ibebya bukonwe bwa kuva miujiza ikita kazi munda mwage.'' -======= -YOHANA WA KU BATIZA BANTU AKATWA MUNTU -\v 1 Saa yeya mfalme (Sulutani) Herode utenekeza mianda ya Yesu, \v 2 yuwozeli ku bantu yoobe " yewa ni Yohana wa ku batiza bantu afufuka katiika bantu bafile ; ibyebya bukome bwa kuva miujiza ikita kazi munda mwage". ->>>>>>> refs/heads/new diff --git a/14/03.txt b/14/03.txt index 999a9f8..2b30b4f 100644 --- a/14/03.txt +++ b/14/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Herode ilenge kumu kwata yohana na miufunga imu gerezani, ibebya ya Herodia mukazi wa filipo ndugu woobe. \v 4 Mianda oza Yohana awoozanga Herode ndi bilegele kumkwela yewa lulenge. \v 5 Herode atakanga kumutile Yohana maindi kumutina bantu ibebya lamwona nabii. -======= \v 3Herode ilenge kumukwata Yohana na mufunga imu gerezani, ibyebya ya Herodia, mukaazi wa Filipo nduku woobe. \v 4 mianda oza Yohana aooza Herode ndi bilegele kumukwela yewa lulenge . \v 5 Herode atakanga kumutile Yohana maindi kumutiina bantu ibyebya bamuoona nabii. ->>>>>>> refs/heads/new diff --git a/14/06.txt b/14/06.txt index ac75392..088fdb2 100644 --- a/14/06.txt +++ b/14/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Ibebya sikuku ya ku tandika kwa Herode lulenge wa Herodia kuyaanza kumpala ya baenyi na umuyaudilaa ilenge Herode. \v 7 Akamuoza mwanga bintu byoonso aanza. -======= \v 6 Ibyebya sikuku ya ku tandika kwa Herode lulenge wa Herodia kuyaanga kumpala ya baenyi naa umuyaudilaa ulenge Herode. \v 7 Akamuoza imwanga bintu byonse aanza. ->>>>>>> refs/heads/new diff --git a/14/08.txt b/14/08.txt index 953b952..1e96965 100644 --- a/14/08.txt +++ b/14/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 kwa bishawishi bya nene woobe, yewa lulenge aanza muntu ya Yohana wa kubatiza bantu ku simiya.'' \v 9 Mfalme ni mukuyuta ibebya, kwa sababu ya yeya kilaapo amonza kumpala ya baenyi, aoza kama atalama byonso aanza. -======= \v 8 Kwa bishawishi bya nene woobe, yewa lulenge aanza muntu ya Yohana wa kubatiza bantu ku siniiya. \v 9 "Mfalme nimukuyuta ibyebya , kwa sabaabu ya yeya kilaapo amuoza kumpala ya baenyi, aoza atalama byonso aanza. ->>>>>>> refs/heads/new diff --git a/14/10.txt b/14/10.txt index a74bec3..4b4c10c 100644 --- a/14/10.txt +++ b/14/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Mfalme aoza bakataa muntu ya Yohana wa ku batiza bantu mu gerezani. \v 11 Naa muntu woobe na kuibeesa ku siniya na ku nuwa lulenge yewa, akakwata na kumwa nene Yohana wa kubatiza bantu wakuva, wakwata lukoka woobe na kochikaa kuisha wakwenda kkumuoza Yesu. -======= \v 10 Mfalme aoza bakataa muntu ya Yohana wa ku batiza bantu mu gerezani, \v 11 naa muntu woobe na kuibeesa ku siniiya na ku mwa lulenge yewa, akakwata na kumwa nene woobe. \v 12 wafuaasi wa Yohana wa ku batiza bantu wakuva wakwata lukoba woobe na kochekaa kisha wakweenda kumuoza Yesu. ->>>>>>> refs/heads/new diff --git a/14/13.txt b/14/13.txt index 914fad0..4d157da 100644 --- a/14/13.txt +++ b/14/13.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 13 Yesu ilenge kutenekeza yeya, akaatuka kwa mashua waile mahali haina bantu, walawiaye mwene, lakini bantu balenge kwatenekeza, umulonda kwa maulu baiya lonka. \v 14 Yesu numa ku pembeni ya hugalaba, amoona bantu bawelele, kutenekeza lukwa ikuoza mibezi yabo. -======= \v 13 YESU AKUDISHA BANTU ZAIDI YA ELFU ITANU \V 13 Yesu ulenge kutelekeza yeya, akatuka kwa mashuwa waile mahali haina bantu, walani ayewine, lakini bantu balenge kwatenekeza, umulonda kwa maulu buiya buka. \v 14 Yesu uuma ku pembeni ya hugalaba, amoona bantu bawelele, kutenekeza lukwa ikuoza nibezi yabo. ->>>>>>> refs/heads/new diff --git a/14/15.txt b/14/15.txt index 3ed20fa..3541808 100644 --- a/14/15.txt +++ b/14/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Saa ya bukufu, wafwaasi woobe wamuoza, aaga nikumtngwa na yupa ya kuwa ulagee bantu bakatokee kumunuliyaa chakuula ku mwiihi. -======= \v 15 Saa ya bukufu, wafuaasi woobe wamuoza, aaga ni kumtangwa, na yupa ya kuwa, ulagee bantu bakatokee kumunuliyaa chakula ku mwiili. ->>>>>>> refs/heads/new diff --git a/14/16.txt b/14/16.txt index d1aa4e4..4766734 100644 --- a/14/16.txt +++ b/14/16.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 16 Yesu aoza,'' Kakuli muanda bakatokee. Banu mumwe chakuula.'' -\v 17 Baoza,''Aaga tuli na mikali itano lukwa samaki bili.'' \v 18 Aoza, mumwa aaga; -======= \v 16 Yesu aoza : kqkuli muanda bakatokee. Banu mumwe chakuula. \v 17 Baoza, aaga tuli na mikate itanu lukwa samaki bili. \v 18" Yesu aoza, mumwa aaga." ->>>>>>> refs/heads/new diff --git a/14/19.txt b/14/19.txt index ad4e3dc..7d41d7f 100644 --- a/14/19.txt +++ b/14/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Aoza baaba bantu baikana ku sinini. Akwata yewa mikatu itanu lukwa isamaki bili, aiminwa miso yaaba amoona mbinguni aibariki. Aimega yewa mikati na kumwa wafwaasi woobe, na baaba ba mwa bantu. \v 20 Boonso bakuudia na kuikuta, wafwaasi woobe wasangakanya bitwindi bilenge kusilala, na balenge kwaenekeza vikapu kumi na bibili. \v 21 Idadi ya bantu bakuudia, kusikubaeka wakaazi na waana aoza waluume elfu itanu. -======= \v 19 aoza baaba bantu baikana ku suuni. Akwata yewa mikate itanu lukwa isamaki bili, ainuuwa miso yoobe amoona mbiingu aibariki, aimega yewa nuikate na ku mwa wafuaasi woobe, na baaba ba mwa bantu. \v 20 boonse bakuudia na kuikuta, wafuaasi woobe wasangakanya bitwindi bilenge kusilala, na balenge kwatenekeza vikaapu kumi na bibili. \v 21 Idadi ya bantu bakuudia, kusikubaeka wakaazi na waona ooza waluume elfu itanu. ->>>>>>> refs/heads/new diff --git a/27/01.txt b/27/01.txt index 15724b1..a652fc2 100644 --- a/27/01.txt +++ b/27/01.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 1 Kalu yonso bakuluu boonso na banunu balinge kuwakito huukutano, buhoja gisi yakunuyaga. \v 2 Bumufuza buntwala na kumwa kwa Pilato walinge gavana. -======= Yesu mabobu wakuenda kwa Pilato \v 1 kaluyonse bakuluu boonsa na banunu balinge kuwakita huukutano, buhoza gisi yakumuyaga \v 2 bumufuza bumtwala nakumwa kwa Pilato. Walinge gavana. ->>>>>>> refs/heads/new diff --git a/27/03.txt b/27/03.txt index 7a6774e..802fe37 100644 --- a/27/03.txt +++ b/27/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Juda, oliya wachrekiya Yesu, amowa Yesu kusuguka nekokoja ne iyaya nakosa makuta baweli pasteur na banunu. \v 4 Konsa nikta zambi komoza mutu kaima makosa nasali, lele itotola baye kwike? \v 5 Basi yuda usubole makuta kanisa, waile wakuta misinga kusinga, kusabakanye makata iyiyi nasadaka kwababu ni fanga ya mukumba.'' -======= \v 3 Juda oliya wachekiya Yesu amowa Yesu kusuguka nekokoja ne iyaya nakosa makuta. Baweli pasteur na banunu. \v 4 konsa nikita zambi komoza mutu kaina makosa. Nasali, lele itotola baye kwike. \v 5 Basi Yuda usubule Makuta kanisa, waile wakuta misinga kusingo, ->>>>>>> refs/heads/new diff --git a/27/06.txt b/27/06.txt index a1b842b..0d64775 100644 --- a/27/06.txt +++ b/27/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Bakulu ba Makuhani buyoga bebya bindi bya makuta,buwoza, kabilegele kubika munda mwasanduka ya sadaka, ilenge ni kima cha mukuba. \v 7 Kobobo indee kusia kochongoa nakuamwa kotomea kohola iso lee moteme liiwengwe iboa lee kochesea barnyi. \v 8 Koob leo iso littwitanwa isio lee leo isio litwitaowa le masi indee leno. -======= \v 6 kusabakanye makuta iyiyi nasdaka kwababu ni fanga ya mukumba. kobobo indee kusia kochongoa nakuamwa kotomea kohola isio lee moteme liwangwe iboa lee kocheseea barnyi. \v 8 kobobo leo isio litwitanwa isio lee leo isio litwitaowa le masi indee leno. ->>>>>>> refs/heads/new diff --git a/27/09.txt b/27/09.txt index fcc6a8f..f3346d6 100644 --- a/27/09.txt +++ b/27/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Indee nakobongea bebya ochwa ne ndonwa yeremia kocha,'' Bakonde bilya byunda makumi masato bye falanga, bisingekwa byasingekwa byasingekwa byasingekwa ne boma be bayaudi, \v 10 Nakoola isio lee mufundi we byombolwa bye mateke mgwa tati wasiolela.'' -======= \v 9 Indee nakobongea biabya ochwa ne ndonwa Yeremia kocha, " bacondee bilya byunda makuni masato bye falanga, bisinge kwa nyasingekwa byasinge kwa neboma be bayaudi. \v 10 Nakoola isio lee mufundi we byombobwa bye mateke mgwa tati waseielela". ->>>>>>> refs/heads/new diff --git a/27/11.txt b/27/11.txt index ee6cbf4..5549dd6 100644 --- a/27/11.txt +++ b/27/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \v 11 Yesu nakochalwa kombaa kwa liwali nawe nokomobocha, nae na obya mwamiwe bayaudi? Yesu nakocha kwa tiwali nawe nokombocho, nawe na alya Mwami we bayaudi. Yesu nakocha, indee osocha bwachi bwachi? \v 12 Kobobo bapasiteri ni banunu amusitaki komeanda chabwwa ndoocha kendo. \v 13 Bobo Pilato nakomobocha, mungwe mianda chino chise chisukusitaki abo? -======= -\v 11 Yesu nakochalwa kombaa kwa liwali nawe nokomobocha, nawe na olya Mwami we bayaudi ? Yesu nakocha kwa liwali nawe nokombocha, nawe na alya Mwami we bayaudi. Yesu nakocha, indee osocha bwachi !! \v 12 koboba bapasiteri ni banunu amusitaki komeanda chabwa ndoocha kendo. \v 13 Bobo Pilato nakomobocha, Mungwe mianda chino chie chisukusitaki abo ? \v 14 Indee Yesu ndaocha kemo nani kumusitaki omosa lwali nakoshangaa koeta. ->>>>>>> refs/heads/new diff --git a/27/15.txt b/27/15.txt index e179bb5..c640078 100644 --- a/27/15.txt +++ b/27/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Ingwa wakati wengumba konyi ao bitongo, liwali obechaye ni miila chikolekekya mfungwi omosa otasolwe bando. \v 16 Wakati alia waleche mufungwa omosaa waabee mokochebekana sana wabecha nee baraka. -======= \v 15 Ingwa wakati wengumba konyi ao bitongo, liwali obechaye ni miila chikolekekya mfungwi omosa atasolwe bando. \v 16 wakati alia waleche mufungwa umosaa waabe mokochekana sana wabechanee baraka. ->>>>>>> refs/heads/new diff --git a/27/17.txt b/27/17.txt index 73b613a..f54a58b 100644 --- a/27/17.txt +++ b/27/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Baba bando babea bukumbakanene ne Pilato ne kobabocha mwemoko konda naba fungulie ne Barabane Yesu wee buiitaniwe Kristo.''? \v 18 kwee sababu ochebe Ysu obeesiwe kwaa ajili yee boole bwebaekoo bamayaudi. \v 19 Mwambe mikitano mukum, omokachi wake nakumwenda kuba chefu be bwande katika kituka lenu we mukuu enda weka ichini andeli yake. -======= \v 17 Baaba bando babea bukumbakanene ne Pilato ne kobabocha mwemo kokonda nabafungulie nebarabane Yesu wee bwiitaniwe Kristo. \v 18 Kwe sababu ochebe Yesu obeesiwe kwaa ajili yee boole bwebaekoo bamayaudi. \v 19 Mwambe mikitana mukum, omokachi wake na kumwenda ku bachefu be bwande katika kituta lenuwe mukuundeweka ichini andeli yake. ->>>>>>> refs/heads/new diff --git a/27/20.txt b/27/20.txt index 26a242f..fa9fbfe 100644 --- a/27/20.txt +++ b/27/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Indee bapasteri na bnunu na kobasongolola ketongo kye bando ite baengee Baraba olekelibwe ne Yesu uchibwee. \v 21 Liwali nakobabocha liikine,'' ni nani motokonda nabachiboelee?'' nakomosaolea, ''Baraba.'' \v 22 Indee naketange boni nenona yesu uchilwanange kristo?'' Nakochonga base, uchibwee! -======= Inde Bapasteri na banunu na kobasongo lola ketongo kye bando ite baengee balaba olekelibwe ne Yesu uchubibwe. \v 21 Liwali nakobabocha lukine, "ni nani motokonda nabachiboelee?" nakomosaolea, "Baraba : \v 22 Indee naketange boni ne ona Yesu uhitwa nange kristo ? " Nakochanga base, uchibwe ! ->>>>>>> refs/heads/new diff --git a/27/23.txt b/27/23.txt index 4df97fd..77ce776 100644 --- a/27/23.txt +++ b/27/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Nakochanga,'' Kwe kee? osoketanga kosa leni?'' kobob abo na konyelela koketa mocho,'' luchibwee.'' \v 24 Piato amoa owe indee kusi keete kelya ungaoba koketa ne inidee nakomo nabechange na koanjanga, nakoendanga machee, nakoyenga mesa ni kombaa kwabo, nakochanga,'' Sisi ne kosa ne masi ne mondo nona. Ikoma lelee ne mongonda mwinu.'' -======= \v 23 Nakochanga, kwe okee ? osoketanga kosa leni ? " kobob abo na konyelela koketa mocho",uchibwee. \v 24 Pilato amaa awe indee kusikeete kelya ungaoba koketa ne indee makomo mabechange na koanganga, nakoendanga machee, nakoyanga nesani kombaa kwabo, nakochanga, " sisi ne kosa ne masi me mondo nona. Ikomo lelee ne monganda mwini". ->>>>>>> refs/heads/new diff --git a/27/25.txt b/27/25.txt index acf25a0..956e1c6 100644 --- a/27/25.txt +++ b/27/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \v 25 Bantu base nakochanga,'' Masi make ne moungwe monda mwinu ne moganda yito ne monganda mwe bana bito.'' \v 26 Indee makolekekyanga banda, ne indee na kotoma Yesu ututibwange biboko, makomocha uchibwe. -======= -\v 25 Bantu base nakochanga, " Masi make ne maungwe monda mwinu ne monganda yito ne monganda mwe bana bito! " \v 26 Indee nakolekekyanga Baraba, ne indee na kotoma Yesu ututtibwange biboko, nakomocha uchibwe. ->>>>>>> refs/heads/new diff --git a/27/27.txt b/27/27.txt index 074086b..bc82d4b 100644 --- a/27/27.txt +++ b/27/27.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 27 Kobob basola be liwali nakomochana Yesu kiboa lekata lya liwali nakukumabakanya ketongo kye basola, nakomo kombeyanga Yesu. \v 28 Nakumucha nguo chake, nakomobucka kanjulee vangi ye toho. \v 29 Nakusindelea iketa le mikee nakomobweka komotwe. Nakondo ekea fimbo koboko lyake lee sandomee, maknika malu kondoaa kwake na komonyenyeka nekocha,''Uishi maisha malea awami we bayaudi.'' -======= -kobobo basola ba liwali nakomochaa Yesu kuiboa lekata lya ;iwali nakukumbakanya ketongo kye basola, nakomokombyanga Yesu. \v 28 Nakumucha ngue chake, nakomobueka kanyi lee nangi ye soho. \v 29 Nkusindelea iketa le mekee nakomobweka komotwe. Nakomobekea fimbo koboko lyake lee sandomee, nakuika malu kombaa kwake na komonyeyeka nekocha, " Uishi maisha malea, Mwami we bayaudi". ->>>>>>> refs/heads/new diff --git a/27/30.txt b/27/30.txt index 317f62f..f27c95a 100644 --- a/27/30.txt +++ b/27/30.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 30 Nakomolalea soki, nakoenda elya fimbo nakomokomea ayo komotwee. \v 31 Kisha komonyenyeka, nakumucha elya kanfu, nakomobwka lukine nguo chake. Kobob nakoya nake kwa muchie. -======= \v 30 Nakomola lea soki, nakoenda elya fimbo nakomokomoa ayo komotwee. \v 31 Kisha komonyenyeka, nakumucha elya kanju, nakomobweka lukine nguo chake. kobobo nakoya nake kwa muchie. ->>>>>>> refs/heads/new diff --git a/27/32.txt b/27/32.txt index 00dcdad..a75b28b 100644 --- a/27/32.txt +++ b/27/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \v 32 Abechoeya abo mokwenda, nakuku mbakana ne mondo omosa we kireno waitwanaya Simoni, nakamwendekya olya nisalaba kwe mwecho. \v 33 Ne aolea abo iboa yaitwa naya giolgotha, maana mako iboa le Fuvu lee motivee, \v 34 Nakmwabea divai ya sambwa ne sumu indee otowe; kobobo kisha kosenga, nakokona. -======= -\v 32 Abechaya abo mokwenda, na kukumbakana ne mondo omosa we kireno waitwa noya Simoni, nakomwendekya olya msalaba lwe mwecho. \v 33 Ne aolea abo iboa yaitwa noya Golgotha, maana make iboa le fuvu lee motwee, \v 34 Nakomwabea divai ya sambiwa ne sumu indee osowe, kobobo kisha kosaga nakokona. ->>>>>>> refs/heads/new diff --git a/27/35.txt b/27/35.txt index 5394183..eebc0e8 100644 --- a/27/35.txt +++ b/27/35.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 35 Asia abo komotongeka nakoabanya nguo chake, kwe kusunga nena, \v 36 Indee nakuchikaa, nako mwendecha. \v 37 Nonganda mwe mowe wake, ibaa lee msalaba, nakoandikesa monganda mwake'' -======= \v 35 Asiabo komotangeka bakoabanya nguo chake kwe kusinganena, \v 36 Indee nakuchikaa, Nako mwendecha. \v 37 Monganda mwe motwe wake, iboa bumpalaba, nakoandikesa monganda mwake : " ONA NE YESU, MWAMI WE BAYAHUDI ". ->>>>>>> refs/heads/new diff --git a/27/38.txt b/27/38.txt index a08fdd3..c36d8bf 100644 --- a/27/38.txt +++ b/27/38.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \v 38 Ngiba chibelee nakotongeswa nake omosa, omosa sandowe ne ukini sangachi yake. \v 39 Banda babechoya mokoeta monyea nekomotonda, nakuchingya metwe chabo \v 40 ne kocha, mbona ochechi ungabea kanisa na kolesenga monda mwe maswa masato? ikomboa kabobo! indee awe ne ika komotee. -======= -\v 38 Ngiba chibelee nakotongeswa nake amosa, omosa sandome ne ukini sangachi yake. \v 39 Bando babechaya mokoeta mongea nakomotonda, nakuchingya netwe chabo, \v 40 nekocha, mbona ochechi ungabea kanisa na kolesenga monda mwe masu masato? okombaa kobobo ! indee awe ne Mwana wa Filenyambe ika komotee. ->>>>>>> refs/heads/new diff --git a/27/41.txt b/27/41.txt index cb39373..d8332ba 100644 --- a/27/41.txt +++ b/27/41.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 41 Indee kobobo, bapasteri bakoo, balimmu besambo ne banunu nakomosekoa, nakochongolela, \v 42'' Okoe bakine, kobobo ndakaobe kuitosa we mwene. Awe ndasi mwami we bayaudi? Wokee kotoka kamotee na bae tota mwinenye. -======= \v 41 Indee kobobo ba pasteri bakoo, balimu besambo ne banunu makomosekoa, nakochangolela, \v 42 okoebakine, kobobo ndakaobe kuitosa awe mwene. Awe ndasi Mwami we bayahudi ? Wiku kotoka komotee na bae tota mwimenye. ->>>>>>> refs/heads/new diff --git a/27/43.txt b/27/43.txt index a5aab29..31f1533 100644 --- a/27/43.txt +++ b/27/43.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \v 43 Otovamenye Filenyambe, indee filenyambe nelomokoe kabobo ingwa otomokonda. Kobobo nakochongolela, meene mwana wa Filenyambe.'' \v 44 Nani balya ngiba batondekuni navosa nake nakomotonda konjea ena ena. -======= -\v 43 Otaimenye Fileyambe, indee Filenyambe ne omokoe kabobo ingwa otomokonda. Koboka nakochongo lela, meene mwana wa Filanyambe. \v 44 Nani balya ngiba batondekwa amosa nake nakomotonda konjea ena ena. ->>>>>>> refs/heads/new diff --git a/manifest.json b/manifest.json index 3637eae..486ce6f 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"mat","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Kwange","direction":"ltr","anglicized_name":"","region":"Africa","is_gateway_language":false,"id":"zmb-x-kwange"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin-azaza","Georges","Faustin Azaza Banyungu"],"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"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["front-title","01-title","06-01","06-03","06-05","06-08","06-11","06-14","06-16","06-19","14-22","14-25","14-28","14-31","14-34","22-23","22-25","22-29","22-31","22-34","22-37","22-39","22-41","22-43","22-45","19-16","19-18","19-20","19-23","19-25","19-29","27-45","14-01","14-03","14-06","14-08","14-10","14-13","14-15","14-16","14-19","19-01","19-03","19-05","19-07","19-10","19-13","19-28","22-01","22-04","22-05","22-08","22-11","22-13","22-15","22-18","22-20","27-01","27-03","27-09","27-11","27-15","27-20","27-23","27-25","27-27","27-30","27-32","27-35","27-38","27-41","27-43","27-48","27-51","27-54","27-57","27-59","27-62","27-65","28-01","28-03","28-05","28-08","28-11","28-14","28-16","27-17","27-06","28-18","02-13","02-16","02-17","02-19","02-22","12-01","12-03","12-05","12-07","12-09","12-11","12-13","12-title","11-title","12-15","12-18","12-19","24-01","24-03","24-06","24-12","24-09","24-15","24-19","24-23","24-26","24-29","24-30","24-32","24-36","24-34","24-37","24-40","24-43","24-45","24-48","26-01","26-03","26-10","26-06","26-12","26-14","26-17","26-20","26-23","26-26","26-30","26-33","26-36","26-39","26-45","26-47","26-51","26-42","26-55","26-57","26-59","26-62","26-65","26-67","26-69","26-71","26-73","26-49","12-22","12-24","12-26","12-28","12-31","12-33","12-36","12-38","12-41","12-42","12-43","12-48","12-46","18-07","18-09","18-10","18-12","18-15","18-17","18-18","18-21","18-23","18-26","18-28","18-30","18-32","18-34","01-01","01-04","01-07","01-09","01-12","01-15","01-18","01-20","01-22","01-24","02-title","02-01","02-04","02-07","02-09","02-11","03-title","03-01","03-04","03-07","03-10","03-13","03-16","04-title","04-01","04-05","04-07","04-10","04-12","04-14","04-17","04-18","04-21","04-23","05-title","05-01","05-05","05-09","05-11","05-13","05-15","05-17","05-19","05-21","05-23","05-25","05-27","05-29","05-31","05-33","05-36","05-38","05-40","05-43","05-46","07-title","07-01","07-03","07-06","07-07","07-11","07-13","07-15","07-18","07-21","07-24","07-26","07-28","08-21","08-23","08-26","08-28","08-30","08-33","09-01","09-03","09-07","09-10","09-12","09-14","09-16","09-17","09-18","09-20","09-23","09-25","09-27","09-29","09-32","09-35","09-37","10-01","10-02","10-05","10-08","10-11","10-14","10-16","10-19","10-21","10-24","10-26","10-28","10-32","10-34","10-37","10-40","10-42","11-01","11-04","11-07","11-09","11-11","11-13","11-16","11-18","11-20","11-23","11-25","11-28","13-01","13-03","13-07","13-10","13-13","13-15","13-16","13-18","13-20","13-22","13-24","13-27","13-29","13-31","13-33","13-34","13-36","13-40","13-44","13-47","13-49","13-51","13-54","13-57","14-title","15-title","15-01","15-04","15-07","15-10","15-12","15-15","15-18","15-21","15-24","15-27","15-29","15-32","15-36","16-title","16-01","16-03","16-05","16-09","16-11","16-13","16-17","16-19","16-21","16-24","16-27","17-title","17-01","17-03","17-05","17-09","17-11","17-14","17-17","17-19","17-22","17-24","17-26","18-01","18-04","20-title","20-01","20-03","20-05","20-08","20-11","20-13","20-15","20-17","20-20","20-22","20-25","20-29","20-32","21-title","21-01","21-04","21-06","21-09","21-12","21-15","21-18","21-20","21-23","21-25","21-28","21-31","21-33","21-35","21-38","21-40","21-42","21-43","21-45","23-01","23-04","23-06","23-08","23-11","23-13","23-16","23-18","23-20","23-23","23-25","23-27","23-29","23-32","23-34","23-37","25-title","25-01","25-05","25-07","25-10","25-14","25-17","25-19","25-22","25-24","25-26","25-28","25-31","25-34","25-37","25-41","25-44","26-27","27-title"]} \ No newline at end of file +{"project":{"id":"mat","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Kwange","direction":"ltr","anglicized_name":"","region":"Africa","is_gateway_language":false,"id":"zmb-x-kwange"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin-azaza","Georges","Faustin Azaza Banyungu"],"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"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["front-title","01-title","06-01","06-03","06-05","06-08","06-11","06-14","06-16","06-19","14-22","14-25","14-28","14-31","14-34","22-23","22-25","22-29","22-31","22-34","22-37","22-39","22-41","22-43","22-45","19-16","19-18","19-20","19-23","19-25","19-29","27-45","19-01","19-03","19-05","19-07","19-10","19-13","19-28","22-01","22-04","22-05","22-08","22-11","22-13","22-15","22-18","22-20","27-48","27-51","27-54","27-57","27-59","27-62","27-65","28-01","28-03","28-05","28-08","28-11","28-14","28-16","28-18","02-13","02-16","02-17","02-19","02-22","12-01","12-03","12-05","12-07","12-09","12-11","12-13","12-title","11-title","12-15","12-18","12-19","24-01","24-03","24-06","24-12","24-09","24-15","24-19","24-23","24-26","24-29","24-30","24-32","24-36","24-34","24-37","24-40","24-43","24-45","24-48","26-01","26-03","26-10","26-06","26-12","26-14","26-17","26-20","26-23","26-26","26-30","26-33","26-36","26-39","26-45","26-47","26-51","26-42","26-55","26-57","26-59","26-62","26-65","26-67","26-69","26-71","26-73","26-49","12-22","12-24","12-26","12-28","12-31","12-33","12-36","12-38","12-41","12-42","12-43","12-48","12-46","18-07","18-09","18-10","18-12","18-15","18-17","18-18","18-21","18-23","18-26","18-28","18-30","18-32","18-34","01-01","01-04","01-07","01-09","01-12","01-15","01-18","01-20","01-22","01-24","02-title","02-01","02-04","02-07","02-09","02-11","03-title","03-01","03-04","03-07","03-10","03-13","03-16","04-title","04-01","04-05","04-07","04-10","04-12","04-14","04-17","04-18","04-21","04-23","05-title","05-01","05-05","05-09","05-11","05-13","05-15","05-17","05-19","05-21","05-23","05-25","05-27","05-29","05-31","05-33","05-36","05-38","05-40","05-43","05-46","07-title","07-01","07-03","07-06","07-07","07-11","07-13","07-15","07-18","07-21","07-24","07-26","07-28","08-21","08-23","08-26","08-28","08-30","08-33","09-01","09-03","09-07","09-10","09-12","09-14","09-16","09-17","09-18","09-20","09-23","09-25","09-27","09-29","09-32","09-35","09-37","10-01","10-02","10-05","10-08","10-11","10-14","10-16","10-19","10-21","10-24","10-26","10-28","10-32","10-34","10-37","10-40","10-42","11-01","11-04","11-07","11-09","11-11","11-13","11-16","11-18","11-20","11-23","11-25","11-28","13-01","13-03","13-07","13-10","13-13","13-15","13-16","13-18","13-20","13-22","13-24","13-27","13-29","13-31","13-33","13-34","13-36","13-40","13-44","13-47","13-49","13-51","13-54","13-57","14-title","15-title","15-01","15-04","15-07","15-10","15-12","15-15","15-18","15-21","15-24","15-27","15-29","15-32","15-36","16-title","16-01","16-03","16-05","16-09","16-11","16-13","16-17","16-19","16-21","16-24","16-27","17-title","17-01","17-03","17-05","17-09","17-11","17-14","17-17","17-19","17-22","17-24","17-26","18-01","18-04","20-title","20-01","20-03","20-05","20-08","20-11","20-13","20-15","20-17","20-20","20-22","20-25","20-29","20-32","21-title","21-01","21-04","21-06","21-09","21-12","21-15","21-18","21-20","21-23","21-25","21-28","21-31","21-33","21-35","21-38","21-40","21-42","21-43","21-45","23-01","23-04","23-06","23-08","23-11","23-13","23-16","23-18","23-20","23-23","23-25","23-27","23-29","23-32","23-34","23-37","25-title","25-01","25-05","25-07","25-10","25-14","25-17","25-19","25-22","25-24","25-26","25-28","25-31","25-34","25-37","25-41","25-44","26-27","27-title"]} \ No newline at end of file