diff --git a/06/05.txt b/06/05.txt index 0970bff9..42379dc8 100644 --- a/06/05.txt +++ b/06/05.txt @@ -1,9 +1 @@ -<<<<<<< HEAD \v 5 Ogo mwazi gwasimisa boshi baliriho, balondola Stefano muntu waliyunjwir'obwemere na Muka Ochere, na Filipo,Porokoro, Nikanora,Timoni,Parimena,Nikola, mushibirizi we Antiyokiya.\v 6 Babalerh' emalangambere g'entumwa, babere bahuna,babalambulira kw'amaboko. -======= -<<<<<<< HEAD -\v 5 Ogomwazi gwasimisa boshi baliriho, balondola Stefano muntuwaliyunjwir'obwemere na muk'ochere, na Filipo,Porokoro, Nikanora,Timoni,Parimena,Nikola, mushibirizi we Antiyokiya.\v 6 Babalerh'emalangambere g'entumwa, babere bahuna,babalambulira kw'amaboko. -======= -\v 5 Ogomwazi gwasimisa boshi baliriho, balondola Stefano muntu waliyunjwir'obwemere na Muka Ochere, na Filipo, na Porokoro, na Nikanora, na Timoni, Parimena, na Nikola, mushimbulizi w'e Antiokia. \v 6 Babalerh'emalangambere g'entumwa, babere bahuna, babalamburi kw'amaboko. ->>>>>>> 01b9da4f174afdf7d83c9098cb8a4de3da6ac3b2 ->>>>>>> refs/heads/new diff --git a/manifest.json b/manifest.json index 9c98815a..debe1a39 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"direction":"ltr","id":"hav","name":"Havu"},"format":"usfm","resource":{"id":"reg"},"translators":["kihavu","Faustin","hav2"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":3,"date_modified":20160614,"version":"5"},{"language_id":"en","resource_id":"ulb","checking_level":3,"date_modified":20160614,"version":"5"},{"language_id":"en","resource_id":"udb","checking_level":3,"date_modified":20160614,"version":"5"}],"finished_chunks":["00-title","26-01","26-04","26-06","25-01","25-04","25-06","25-09","25-11","25-13","25-17","25-21","25-23","25-25","26-09","26-12","26-15","26-19","26-22","26-24","26-27","26-30","01-12","01-15","01-17","01-20","01-24","06-05","06-07","06-08","06-10","06-12","07-06","07-11","07-09","11-04","11-07","11-11","11-15","11-17","11-19","11-22","11-25","11-27","11-29","11-01","14-01","14-03","14-05","14-08","14-11","14-14","14-17","14-19","14-21","14-23","14-27","22-06","22-09","22-12","22-14","22-17","22-19","22-22","22-25","22-27","22-30","28-28","28-30","16-01","16-04","16-06","16-09","16-11","16-14","16-16","16-19","16-22","16-25","16-27","16-29","16-32","16-35","16-37","16-40","17-01","17-03","17-05","17-08","17-10","17-13","17-16","17-18","17-19","17-22","17-24","17-26","17-28","17-30","17-32","02-05","02-08","02-12","02-14","02-16","02-18","02-20","02-22","02-25","02-27","02-29","02-32","02-34","02-37","02-40","02-43","02-46","04-08","04-11","04-13","04-15","04-19","04-27","04-29","04-32","04-36","22-03","22-01","01-06","01-21","02-01","01-title","01-04","01-01","24-01","24-14","24-17","24-20","24-22","24-24","24-26","27-01","27-03","27-07","27-09","27-12","27-14","27-17","27-19","27-21","27-23","27-27","27-30","27-33","27-36","27-39","27-42","24-04","24-07","24-10","05-07","05-09","05-22","03-01","03-07","03-09","03-15","03-17","03-19","03-24","15-01","15-03","15-05","15-07","15-10","15-12","15-13","15-15","15-19","15-22","15-24","15-27","15-30","15-33","15-36","15-39","07-14","07-17","07-20","07-22","07-26","07-29","07-31","07-33","07-35","07-38","07-41","07-43","07-44","07-47","07-51","07-54","07-57","07-59","08-01","08-04","08-06","08-09","08-12","08-14","08-18","08-20","08-24","08-25","08-26","08-29","08-32","08-34","08-36","08-39","09-01","09-03","09-05","09-08","09-10","09-13","09-17","09-20","09-23","09-26","09-28","09-31","09-33","09-36","09-38","09-40","10-01","10-03","10-07","10-09","10-13","10-17","10-19","10-22","10-24","10-25","10-27","10-30","10-34","10-36","10-39","10-42","10-44","10-46","18-01","18-04","18-07","18-09","18-12","18-14","18-16","18-18","18-20","18-22","18-24","18-27","19-01","19-03","19-05","19-08","19-11","19-13","19-15","19-18","19-21","19-23","19-26","19-28","19-30","19-33","19-35","19-38","20-01","20-04","20-07","20-09","20-11","20-13","20-15","20-17","20-22","20-25","20-28","20-31","20-33","20-36","21-01","21-03","21-05","21-07","21-10","21-12","21-15","21-17","21-20","21-22","21-25","21-27","21-30","21-32","21-34","21-37","21-39","02-title","03-title","04-title","05-title","07-title","07-01","07-04","08-title","09-title","10-title","11-title","12-01","12-03","12-05","12-07","12-09","12-11","12-13","12-16","12-18","12-20","12-22","12-24","13-title","14-title","15-title","16-title","12-title","17-title","18-title","19-title","21-title","22-title","23-title","24-title","25-title","26-title","27-title","28-title","01-09","28-01","28-03","28-05","28-07","28-13","28-16","28-19","28-21","28-23","28-25","28-27","03-04","03-11","03-13","03-21","04-01","04-05","04-21","04-23","04-26","04-34","05-26","05-01","05-03","05-12","05-14","05-17","05-19","05-24","05-29","05-33","05-35","05-38","06-title","05-40","06-01","06-02"]} \ No newline at end of file +{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"direction":"ltr","id":"hav","name":"Havu"},"format":"usfm","resource":{"id":"reg"},"translators":["kihavu","Faustin","hav2"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":3,"date_modified":20160614,"version":"5"},{"language_id":"en","resource_id":"ulb","checking_level":3,"date_modified":20160614,"version":"5"},{"language_id":"en","resource_id":"udb","checking_level":3,"date_modified":20160614,"version":"5"}],"finished_chunks":["00-title","26-01","26-04","26-06","25-01","25-04","25-06","25-09","25-11","25-13","25-17","25-21","25-23","25-25","26-09","26-12","26-15","26-19","26-22","26-24","26-27","26-30","01-12","01-15","01-17","01-20","01-24","06-07","06-08","06-10","06-12","07-06","07-11","07-09","11-04","11-07","11-11","11-15","11-17","11-19","11-22","11-25","11-27","11-29","11-01","14-01","14-03","14-05","14-08","14-11","14-14","14-17","14-19","14-21","14-23","14-27","22-06","22-09","22-12","22-14","22-17","22-19","22-22","22-25","22-27","22-30","28-28","28-30","16-01","16-04","16-06","16-09","16-11","16-14","16-16","16-19","16-22","16-25","16-27","16-29","16-32","16-35","16-37","16-40","17-01","17-03","17-05","17-08","17-10","17-13","17-16","17-18","17-19","17-22","17-24","17-26","17-28","17-30","17-32","02-05","02-08","02-12","02-14","02-16","02-18","02-20","02-22","02-25","02-27","02-29","02-32","02-34","02-37","02-40","02-43","02-46","04-08","04-11","04-13","04-15","04-19","04-27","04-29","04-32","04-36","22-03","22-01","01-06","01-21","02-01","01-title","01-04","01-01","24-01","24-14","24-17","24-20","24-22","24-24","24-26","27-01","27-03","27-07","27-09","27-12","27-14","27-17","27-19","27-21","27-23","27-27","27-30","27-33","27-36","27-39","27-42","24-04","24-07","24-10","05-07","05-09","05-22","03-01","03-07","03-09","03-15","03-17","03-19","03-24","15-01","15-03","15-05","15-07","15-10","15-12","15-13","15-15","15-19","15-22","15-24","15-27","15-30","15-33","15-36","15-39","07-14","07-17","07-20","07-22","07-26","07-29","07-31","07-33","07-35","07-38","07-41","07-43","07-44","07-47","07-51","07-54","07-57","07-59","08-01","08-04","08-06","08-09","08-12","08-14","08-18","08-20","08-24","08-25","08-26","08-29","08-32","08-34","08-36","08-39","09-01","09-03","09-05","09-08","09-10","09-13","09-17","09-20","09-23","09-26","09-28","09-31","09-33","09-36","09-38","09-40","10-01","10-03","10-07","10-09","10-13","10-17","10-19","10-22","10-24","10-25","10-27","10-30","10-34","10-36","10-39","10-42","10-44","10-46","18-01","18-04","18-07","18-09","18-12","18-14","18-16","18-18","18-20","18-22","18-24","18-27","19-01","19-03","19-05","19-08","19-11","19-13","19-15","19-18","19-21","19-23","19-26","19-28","19-30","19-33","19-35","19-38","20-01","20-04","20-07","20-09","20-11","20-13","20-15","20-17","20-22","20-25","20-28","20-31","20-33","20-36","21-01","21-03","21-05","21-07","21-10","21-12","21-15","21-17","21-20","21-22","21-25","21-27","21-30","21-32","21-34","21-37","21-39","02-title","03-title","04-title","05-title","07-title","07-01","07-04","08-title","09-title","10-title","11-title","12-01","12-03","12-05","12-07","12-09","12-11","12-13","12-16","12-18","12-20","12-22","12-24","13-title","14-title","15-title","16-title","12-title","17-title","18-title","19-title","21-title","22-title","23-title","24-title","25-title","26-title","27-title","28-title","01-09","28-01","28-03","28-05","28-07","28-13","28-16","28-19","28-21","28-23","28-25","28-27","03-04","03-11","03-13","03-21","04-01","04-05","04-21","04-23","04-26","04-34","05-26","05-01","05-03","05-12","05-14","05-17","05-19","05-24","05-29","05-33","05-35","05-38","06-title","05-40","06-01","06-02"]} \ No newline at end of file