diff --git a/04/20.txt b/04/20.txt index 6d76df4..04e53cd 100644 --- a/04/20.txt +++ b/04/20.txt @@ -1 +1,5 @@ +<<<<<<< HEAD \v 20 Imagusa littafi nimi aguddunini kapiyu tuma unyong kudahg aguruyi azomo. Ayashillaci ami ayi unyong kugahg ama deniyi ayizhi.\v 21 Ima cigha yeni abere, "ukyaru u nassi ukuri anato ayin."\v 22 Ayami amayimi yenama shaida ukusu na duk uyeni ama sassana abere adugan ami acijja akano kaiyi. Asu kumagu, "Akono kisufu kanka, bazan keneshi?" +======= +\v 20 \v 21 \v 22 +>>>>>>> refs/heads/new diff --git a/04/25.txt b/04/25.txt index 1dcd02b..7ffb242 100644 --- a/04/25.txt +++ b/04/25.txt @@ -1 +1,5 @@ +<<<<<<< HEAD \v 25 Nbashini nibin ade aya zani ayini akapa kiliya, akapa kanna ama gusa uzo kiwa kitar nakudeze baka shiri madogo, kapa kami ayisha igbom au pandaru umayinzhi mami.\v 26 Ama kunu ini Iliya kapidong uyini ima zomi ba piyarumi ana Yesah piyini umi agu Zarifat kuri apati Usidon. \v 27 Adenkpakti mudun unyong Israila akapa ka anabi Elisha, ba pidong na ama garganayi se upidong na anayesah agu Na'aman piyu suriya utayi." +======= +\v 25 \v 26 25 \v 27 +>>>>>>> refs/heads/new diff --git a/04/28.txt b/04/28.txt index f29ff22..bae05ee 100644 --- a/04/28.txt +++ b/04/28.txt @@ -1 +1,5 @@ +<<<<<<< HEAD \v 28 Ayami ayi unyong kudaghg ama potya manigi nama poti ukusunna Yibashya. \v 29 Nadug uyeni ama coko anurayi makana unyong ubiga ajagayi aka no kakatari kanna ama suga a maguragu yenia ruyi ika jigi kajes. \v 30 Ima kelluga akacaci kayeni maworoyi. +======= +\v 28 \v 29 +>>>>>>> refs/heads/new diff --git a/06/01.txt b/06/01.txt new file mode 100644 index 0000000..62cc4c1 --- /dev/null +++ b/06/01.txt @@ -0,0 +1 @@ +\v 1 Amayi aden Absabar Yesu isu paga unyong kakab kininaru, Almajirai ayi asu pukara ininaru imi, asu nyamara akari yeni ashire. \v 2 Adon unyong Afarisiwa asu kuma "iyah iwanini na idisha ukusu za dugan katuk kasabar?. \ No newline at end of file diff --git a/06/03.txt b/06/03.txt new file mode 100644 index 0000000..7350071 --- /dev/null +++ b/06/03.txt @@ -0,0 +1 @@ +\v 3 Yesu ima sheri yeni agu, iyitabbi ukusunna Dauda ima dene akapa kanna ima pok igbom, yi no ayellah amayi nayi? \v 4 Ima rinya karari ka kashiri ima zya ugurasu mi arye, aduksha ayarumi arah mayi nayi are," muyi kene ayi mafiristoci utamani mana rye. \v 5 Ima gu yeni, Konokapiyar kayi kashiri ka sabar. \ No newline at end of file diff --git a/06/06.txt b/06/06.txt new file mode 100644 index 0000000..a0d0cb6 --- /dev/null +++ b/06/06.txt @@ -0,0 +1 @@ +\v 6 Muma wana adon Asabar yima rinya kudegha abasha aya shillaci mih pidon uyar ukahkam piyana kacara kaiyi karye kakini.\v 7 Agyakaran ufarisiyawa amen ba idama gargana piyami katuk kasabar, magu yeni azug ukusu kizogoru kiyi agu idisha ukusu zadugan. \v 8 Imama yogotya ukusuna yena mingza, image piyana kacara kayi kakiti, "coko a nyazhanka aka caci kayeri, piyami ima coko nyazanha. \ No newline at end of file diff --git a/06/09.txt b/06/09.txt new file mode 100644 index 0000000..e26a9ee --- /dev/null +++ b/06/09.txt @@ -0,0 +1 @@ +\v 9 Yesu gu yeni, "Nnbshini mudugan magu katuk ka sabar adishi mudgan na kucok, a gaska nivataru ba awung shi? \v 10 Ima yita yeni naduk, agu piyami, "Dukanama kacara" na madene kene, kacara kayi kama gargha.\v 11 Ama potaya manigi, adene ushawara unyong uyeni ukusun na adama dene na Yesu. \ No newline at end of file diff --git a/06/12.txt b/06/12.txt new file mode 100644 index 0000000..7f4f386 --- /dev/null +++ b/06/12.txt @@ -0,0 +1 @@ +\v 12 Muma wana ana tuk ami, ima tuga uzo katari ma berya ka kashiri ima zya katuk naduk asu gisa kashiri. \v 13 Rikata nima vurka iyarkya Almajirai akana uyi, ima samha pituru akaba unyong uyeni, a yellana ima yarkya yeni "Akunzun". \ No newline at end of file diff --git a/06/14.txt b/06/14.txt new file mode 100644 index 0000000..0a249ef --- /dev/null +++ b/06/14.txt @@ -0,0 +1 @@ +\v 14 Azagi akunzun ami ayi Siman piyana amana yesagh agu Bitrus na kobina uyi, Andrawus, Yakubu, Yahaya Filibus Bartalamawus. \v 15 Matta, toma Yakubu konoka Halfa, Siman piyana ayesah Zaloti, Yahuda konaka Yakubu. \v 16 Na Yahuda konaka iskariyoti, yi ima wana piyu kucok. \ No newline at end of file diff --git a/06/17.txt b/06/17.txt new file mode 100644 index 0000000..af7ef1c --- /dev/null +++ b/06/17.txt @@ -0,0 +1 @@ +\v 17 Yesu ima toro aciri uzoh katari ayina yeni, ama yazanha amapandharae Almajirai ayi adun ama tumu akatikam, na ayashillaci adun aciri Yahudiya na Urshalima na akano kuteku Taya na Usidon. \v 18 Ama wana mapoti uyi na ama zuga garganzhi man gbana muyeni. Ayadeh iruhohe makanzi ama zuga magarga. \v 19 Ayar ara ama konosura amanazhi marepsheyi magu uiko umagarga ucizzah uyi, idene yeni agarga naduk. \ No newline at end of file diff --git a/06/20.txt b/06/20.txt new file mode 100644 index 0000000..b2988c3 --- /dev/null +++ b/06/20.txt @@ -0,0 +1 @@ +\v 20 Ima yita Almajirai agu yeni, iyi aya libarkami yi aya cazah, kigomoh kikashiri akiyih. \v 21 Aya libarka ayi igbom minah, adama deninu shi tunzira. Aya libarka aya shibana minah, idama cezye. \ No newline at end of file diff --git a/06/22.txt b/06/22.txt new file mode 100644 index 0000000..72c4976 --- /dev/null +++ b/06/22.txt @@ -0,0 +1 @@ +\v 22 Aya libarka yin na agabenini yinna awakarini, agadduzu azagi ayin ana wana a kuchok, magu a kono kapiyar. Katuk kah idama tubtaza na rizagha magu kusugu kabogk. \v 23 Magu kenne muyi idama zuga kutagh kagbaki uzo ashiri, magu kenna acitti ama yisha onabawa. \ No newline at end of file diff --git a/06/24.txt b/06/24.txt new file mode 100644 index 0000000..03b3f3c --- /dev/null +++ b/06/24.txt @@ -0,0 +1 @@ +\v 24 Kidere kiyin ayadicara iman shere mshigruga mayin. \v 25Kidere kiyin aya shitizin mina, magu idama potya igbom kazono. \ No newline at end of file diff --git a/06/26.txt b/06/26.txt new file mode 100644 index 0000000..ba896ff --- /dev/null +++ b/06/26.txt @@ -0,0 +1 @@ +\v 26 Kidere kiyin aya kicere mina magu idam disha ugongono asu shibana kazono. Kidere kiyinna ayar adukshini kicibru magu, kenna aciti azoni ama disha akunzun kabere. \ No newline at end of file diff --git a/06/27.txt b/06/27.txt new file mode 100644 index 0000000..5259cf6 --- /dev/null +++ b/06/27.txt @@ -0,0 +1 @@ +\v 27 Nbashini potinmih, manin aya za mananini adisha mudogan kaya gabanin. \v 28 Denin aya zogonzhini libarka gishin kashiri kaya cogono uyin. \ No newline at end of file diff --git a/06/29.txt b/06/29.txt new file mode 100644 index 0000000..2959f56 --- /dev/null +++ b/06/29.txt @@ -0,0 +1 @@ +\v 29 Piyi kpallan bu aritamani pitumbarayi nimanzu nimi piyi sheribu kubazaran, pizu nyazayi akurigah kumu. \v 30 Kadugin aya gissanni.Pidon yazu zyan kadamana kayin zu gbene magu asuddeni. \ No newline at end of file diff --git a/06/31.txt b/06/31.txt new file mode 100644 index 0000000..42902b1 --- /dev/null +++ b/06/31.txt @@ -0,0 +1 @@ +\v 31 Ukusunna pimani agu ayar adishibu, disha yeni kene. \v 32 Npimani piyi sunibu utayi, iyanna ukusunghu udama pirabu? ko ayade ibang asuni ayasuni yeni.\v 33 Nna iyisha aliheri kaya dishini alhori utayeni, iyan iyih iladiyin? ayi ibang ma ana disha kene. \v 34 Nna idugi kuta ku makusu kayana ideni kasugumi agu adama gudduni iyan iyi uriba uyin? ayi ibang ma ana dugsha kuta kayi ibang, adishaya kasugu magu aguddu yeni kaduntarin kenna ama shere. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 714a3d6..a50c2a8 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"luk","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Lere","direction":"ltr","anglicized_name":"Lere","region":"Africa","is_gateway_language":false,"id":"gnh"},"format":"usfm","resource":{"id":"reg"},"translators":["WAKSON","lere","ishaya shem"],"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"},{"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":["19-title","19-01","19-03","19-05","19-08","19-11","19-13","19-16","19-18","19-20","19-22","19-24","19-26","19-28","19-29","19-32","19-37","19-39","19-41","19-43","19-45","19-47","20-title","20-03","20-05","20-07","20-09","20-11","20-13","20-15","20-17","20-19","20-21","20-23","20-25","20-27","20-29","20-34","20-37","20-39","20-41","20-45","23-title","23-01","23-03","23-06","23-08","23-11","23-13","23-15","23-18","23-20","23-23","23-26","23-27","23-32","23-33","23-35","23-36","23-39","23-42","23-44","23-46","23-52","23-54","10-01","10-03","10-05","10-08","10-10","10-13","10-16","10-17","10-21","10-22","10-23","10-25","10-29","10-31","10-33","10-36","10-38","10-40","front-title","11-01","11-02","11-03","11-05","11-09","11-11","11-14","11-16","11-24","11-27","11-29","11-31","11-32","11-33","11-37","11-42","11-43","11-47","11-49","11-52","11-53","12-01","12-02","12-04","12-06","12-08","12-11","12-13","12-16","12-20","12-22","12-24","12-27","12-29","12-31","12-33","12-35","12-37","12-39","12-41","15-title","15-01","15-03","15-06","15-08","15-11","15-13","15-15","15-17","15-20","15-22","15-25","15-28","15-31","17-01","17-03","17-05","17-07","17-09","17-11","17-14","17-17","17-20","17-22","17-25","17-28","17-30","17-32","17-34","17-37","18-title","18-01","18-03","18-06","18-09","18-11","12-45","12-47","12-49","12-51","12-54","12-57","11-39","18-15","18-18","18-22","18-24","18-26","18-28","18-31","18-34","18-35","18-38","18-40","18-42","16-01","16-03","16-05","16-08","16-10","16-13","16-14","16-16","16-18","16-19","16-22","16-24","16-25","16-27","16-29","21-title","21-01","21-05","21-07","21-10","21-12","21-14","21-16","21-20","21-23","21-25","21-27","21-29","21-32","21-34","21-36","21-37","22-title","22-01","22-03","22-05","22-07","22-10","22-12","22-14","22-17","22-19","22-21","22-24","22-26","22-28","22-31","22-33","22-35","22-37","22-39","22-41","22-47","22-49","22-52","22-56","07-01","07-02","07-06","07-09","07-11","07-16","07-18","07-21","07-27","07-29","07-31","07-33","07-36","07-39","07-41","07-44","07-46","07-48","22-59","22-61","22-66","24-04","24-06","24-08","24-11","24-13","24-15","24-19","24-25","24-28","24-30","24-33","24-36","24-38","24-41","24-44","24-48","24-50","24-52","01-01","01-05","01-08","01-11","01-14","01-16","01-21","01-24","01-18","01-26","01-30","01-34","01-36","01-39","01-42","01-46","01-48","01-50","01-52","01-54","01-56","01-59","01-62","01-64","01-67","01-69","01-80","01-72","01-76","01-78","02-01","02-04","02-06","02-08","02-10","02-13","02-15","02-17","02-21","02-22","02-25","02-27","02-30","02-33","02-36","02-39","02-41","02-45","02-51","02-48","13-01","13-04","13-06","13-08","13-10","13-12","13-15","13-17","13-18","13-20","13-22","13-25","13-28","13-31","13-34","14-01","14-04","14-07","14-10","14-12","14-13","14-15","14-34","14-18","14-21","14-23","14-25","14-28","14-31","24-01","03-title","03-01","03-03","03-04","03-05","03-07","03-08","03-09","03-10","03-12","03-14","03-15","03-17","03-18","03-21","03-23","03-25","03-27","03-30","04-35","04-38","04-40","04-42","05-title","05-01","05-04","05-14","05-15","05-17","05-08","05-12","05-18","05-20","05-22","05-25","05-27","05-29","05-33","05-36","05-37","09-01","09-03","09-05","09-07","09-10","08-01","08-04","09-12","09-15","09-18","09-20","09-23","09-30","09-32","09-34","09-37","09-41","09-43","09-46","09-49","09-51","09-54","09-57","09-59","09-61","08-07","08-09","08-11","08-14","08-16","08-22","08-24","08-26","08-28","08-30","08-32","08-34","08-38","08-43","08-45","08-47","08-49","09-title","08-51","08-54","01-title","02-title","03-33","03-36","06-title","07-title","07-24","08-title","08-19","08-36","08-40","09-26","09-28","10-title","11-title","11-18","11-21","11-45","12-title","13-title","14-title","16-title","17-title","18-13","20-01","22-43","22-45","22-54","22-63","22-69","23-29","23-48","23-50","24-title","24-17","24-21","24-22","24-45","06-41","06-43","06-45","06-46","06-39","06-49","06-38","06-37","06-35","04-title","04-05","04-08","04-03","04-01","04-09","04-12","04-16","04-14","04-18","04-20","04-23","04-25","04-28","04-31","04-33"]} \ No newline at end of file +{"project":{"id":"luk","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Lere","direction":"ltr","anglicized_name":"Lere","region":"Africa","is_gateway_language":false,"id":"gnh"},"format":"usfm","resource":{"id":"reg"},"translators":["WAKSON","lere","ishaya shem"],"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"},{"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":["19-title","19-01","19-03","19-05","19-08","19-11","19-13","19-16","19-18","19-20","19-22","19-24","19-26","19-28","19-29","19-32","19-37","19-39","19-41","19-43","19-45","19-47","20-title","20-03","20-05","20-07","20-09","20-11","20-13","20-15","20-17","20-19","20-21","20-23","20-25","20-27","20-29","20-34","20-37","20-39","20-41","20-45","23-title","23-01","23-03","23-06","23-08","23-11","23-13","23-15","23-18","23-20","23-23","23-26","23-27","23-32","23-33","23-35","23-36","23-39","23-42","23-44","23-46","23-52","23-54","10-01","10-03","10-05","10-08","10-10","10-13","10-16","10-17","10-21","10-22","10-23","10-25","10-29","10-31","10-33","10-36","10-38","10-40","front-title","11-01","11-02","11-03","11-05","11-09","11-11","11-14","11-16","11-24","11-27","11-29","11-31","11-32","11-33","11-37","11-42","11-43","11-47","11-49","11-52","11-53","12-01","12-02","12-04","12-06","12-08","12-11","12-13","12-16","12-20","12-22","12-24","12-27","12-29","12-31","12-33","12-35","12-37","12-39","12-41","15-title","15-01","15-03","15-06","15-08","15-11","15-13","15-15","15-17","15-20","15-22","15-25","15-28","15-31","17-01","17-03","17-05","17-07","17-09","17-11","17-14","17-17","17-20","17-22","17-25","17-28","17-30","17-32","17-34","17-37","18-title","18-01","18-03","18-06","18-09","18-11","12-45","12-47","12-49","12-51","12-54","12-57","11-39","18-15","18-18","18-22","18-24","18-26","18-28","18-31","18-34","18-35","18-38","18-40","18-42","16-01","16-03","16-05","16-08","16-10","16-13","16-14","16-16","16-18","16-19","16-22","16-24","16-25","16-27","16-29","21-title","21-01","21-05","21-07","21-10","21-12","21-14","21-16","21-20","21-23","21-25","21-27","21-29","21-32","21-34","21-36","21-37","22-title","22-01","22-03","22-05","22-07","22-10","22-12","22-14","22-17","22-19","22-21","22-24","22-26","22-28","22-31","22-33","22-35","22-37","22-39","22-41","22-47","22-49","22-52","22-56","07-01","07-02","07-06","07-09","07-11","07-16","07-18","07-21","07-27","07-29","07-31","07-33","07-36","07-39","07-41","07-44","07-46","07-48","22-59","22-61","22-66","24-04","24-06","24-08","24-11","24-13","24-15","24-19","24-25","24-28","24-30","24-33","24-36","24-38","24-41","24-44","24-48","24-50","24-52","01-01","01-05","01-08","01-11","01-14","01-16","01-21","01-24","01-18","01-26","01-30","01-34","01-36","01-39","01-42","01-46","01-48","01-50","01-52","01-54","01-56","01-59","01-62","01-64","01-67","01-69","01-80","01-72","01-76","01-78","02-01","02-04","02-06","02-08","02-10","02-13","02-15","02-17","02-21","02-22","02-25","02-27","02-30","02-33","02-36","02-39","02-41","02-45","02-51","02-48","13-01","13-04","13-06","13-08","13-10","13-12","13-15","13-17","13-18","13-20","13-22","13-25","13-28","13-31","13-34","14-01","14-04","14-07","14-10","14-12","14-13","14-15","14-34","14-18","14-21","14-23","14-25","14-28","14-31","24-01","03-title","03-01","03-03","03-04","03-05","03-07","03-08","03-09","03-10","03-12","03-14","03-15","03-17","03-18","03-21","03-23","03-25","03-27","03-30","04-35","04-38","04-40","04-42","05-title","05-01","05-04","05-14","05-15","05-17","05-08","05-12","05-18","05-20","05-22","05-25","05-27","05-29","05-33","05-36","05-37","09-01","09-03","09-05","09-07","09-10","08-01","08-04","09-12","09-15","09-18","09-20","09-23","09-30","09-32","09-34","09-37","09-41","09-43","09-46","09-49","09-51","09-54","09-57","09-59","09-61","08-07","08-09","08-11","08-14","08-16","08-22","08-24","08-26","08-28","08-30","08-32","08-34","08-38","08-43","08-45","08-47","08-49","09-title","08-51","08-54","01-title","02-title","03-33","03-36","06-title","07-title","07-24","08-title","08-19","08-36","08-40","09-26","09-28","10-title","11-title","11-18","11-21","11-45","12-title","13-title","14-title","16-title","17-title","18-13","20-01","22-43","22-45","22-54","22-63","22-69","23-29","23-48","23-50","24-title","24-17","24-21","24-22","24-45","06-41","06-43","06-45","06-46","06-39","06-49","06-38","06-37","06-35","04-title","04-05","04-08","04-03","04-01","04-09","04-12","04-16","04-14","04-18","04-20","04-23","04-25","04-28","04-31","04-33","06-01","06-06","06-03","06-09","06-12","06-14","06-17","06-20","06-22","06-24","06-26","06-27","06-29","06-31"]} \ No newline at end of file