auto save

02/07.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 7 Mat Herod ning umaing nak ata patanganing ya manga ai kuyerin aput ngakat pasoyeraiyang sain poing batangkaiyang ngu korek ya. \v 8  Ning yerin Betlehem na ukang, ngakat kuyeraiyang , '' Ut pandingda neka ngu ya taing kei. Sain yeya toleiyan ngu, nanou meta rei apun yo nana kak ut ninne pingeng enet.''
-=======
-\v 7 Herot ga yangu hup arunanai ka giguap hin ga kayak i garam wayant giba hin gakantui kurinai, am gararab wantuang anai wat gubuak aus a. \v 8 Gini kurinai gia Betlehem, ka gini wat kurinai, "Agam wahan wahan hin ka am wararab garikakak arunai. Ini agam rurarab ayang, ingka agam wakab hup nabai zi, ingka zi guah yabiak hin yais mint ya."
->>>>>>> branch 'master' of git@content-ssh.bibletranslationtools.org:PJenkins/hob_mat_text_reg.git

02/09.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 9 Sain ning king ya meta ngai wikyin , ning walal let niyening arapuk sung ret sulet ukang ,  mat poing ata patang gining dak ngu ning kin ning sungret ut neka batangkaiyang ngu wenret kangyaiyang. \v 10 Sain ning poing kot wangarei kang yen ning nuiyeng suling ken mateyeng laklining sakuing kakang.
-=======
-\v 9 Kurinai gayangua hup garam guzun gan, hin kurinai gihan, ka wantuang kurinai nungk rarab ayang i gubuak kas ayang gan ginungk i kurinai ka giya gamunti i tagur garikakak mpai ya. \v 10 Ingka kurinai gararab wantuang arunai hin sampan kurinai gan ginu raham.
->>>>>>> branch 'master' of git@content-ssh.bibletranslationtools.org:PJenkins/hob_mat_text_reg.git

02/11.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 11 Ning ya nungin ut neka siming ngu wangarei naing Maria kak irak. Ning kusuk ta sariket pingeng itarak. Ning niyening paus wakalet luo enak ,gol mat frenkinsens mat myrrh. \v 12  Anutat utalap amang gin  kuyerayang king Herod eking gin kum sulet uok, ngu ya ning arapuk song sungret sulet niyening yapai ka ukang.
-=======
-\v 11 Kurinai giya tagur wasak hin gararab gariak wat rinan gan Maria. Kurinai gagantu agan nugun hin gikab maran giruk hin gis mint i gin. Kurinai ga ritib ayak han ingka giku wa mangamangan mimungk ka kurinai gikab sakuak, guin mimungk kab zagaunt su guin mimungk. \v 12 Anutu gini hup wat kurinai gisu sint hin gini kurinai ma yahai Herot  amuk. Ingka kurinai garagi nangkuraham mangan hin kurinai giya parat kurinai an.
->>>>>>> branch 'master' of git@content-ssh.bibletranslationtools.org:PJenkins/hob_mat_text_reg.git

02/13.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 13 Sain ning apai watat sulet ui, Sakuing ya engel amang gin batangket aput Josep ngakat korayang , '' walal , neka sombal naing gak yengenget popat ut Egypt na irei. Kin irei pat nanat yo kukeret ,  Herod ning neka sombal ngu wasangaret ureng ya. ''  \v 14  Utalap kin Josep ning walet mat neka sombal ngu naing gak yenengnet paraket Egypt na ukang. \v 15 Ning kin Egypt na iren Herod ning moyang.  Neng nga batangkaiyang ngu mataing Sakuing da profet makeng gin yaiyang. '' Egypt nunggin  nanou neka ai nawaing rew apuang.''
-=======
-\v 13 Garam wayant raraham tugihan ingka Garam Raham angira gan gini hup wat Josep i sint hin gini gisu ni, "Watakirun, waku gariak wat rinan gan hin am waruhant waha Isip. Wampai Isip ingka Zi yatip yakab hup wat agu zua, i aus a, Herot gagarui gariak ini yayas i yamamp ayang." \v 14 Mikuan arunai Josep giku gariak wat rinan gan ingka kurinai giya Isip. \v 15 Kurinai gimpai ingka Herot gimamp. Wa arunai tugikas garagi hup Garam Raham kab i garat Anutu garam gan, Zi gakayak i gariak angk marub i Isip hin i giba.
->>>>>>> branch 'master' of git@content-ssh.bibletranslationtools.org:PJenkins/hob_mat_text_reg.git

02/16.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 16 Sain Herod ning ngaiyang ngawining ai asak tapalak , ning nuing wangwang yaiyang. Ning walalet ut neka ai Betlehem na mat yapai eking gin kuting niyening sasa iri mat sarikit ngu kuting yurun momoing kak,  sain ngu ngawining ai ta korak .
-=======
-\v 16 Herod giku wayant i haus garam mpai bi gubuac kasaya gazuhup wat,in i giku sampan kukuap. Herot gikab garam yas garam i yahan yayas gariac marub santan i Betlehem christmas gan tup tupela yia in rukayang. Herot ginungk gakantui garam waiyant i gubuac wantuang anai kas ayang gan, i hausin, rungan giku wayant ini yayas gariac marub kas wat gubuac arunanai.
->>>>>>> branch 'master' of git@content-ssh.bibletranslationtools.org:PJenkins/hob_mat_text_reg.git

02/17.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 17 Neko batangkaiyang ngu mataing profet Jeramaia ,making gin meta ko nga kat batang kaiyang , \v 18 '' Meta ko mataing Rama Yapai ka ngakang, mate sakuing mat nuiyeng weng sakuing , Retsel siming yeng yening matenggaiyang, mat ning wating soryaiyang nuing rie suling kengya, nokoya siming yeng kuting momoing kak. ''
-=======
-\v 17 Hup arunanai propet Jeremaia niah gayang gikas gisu nizun,\v 18 "Kayak ayang wat rangayang basinta gimi Rama. Resel girang i gariac an, in ma gini garam mangan Ka Sagat mangan ma yamarigin i sampan gan amuc, i hausin gariac was gan gimamp sib."
->>>>>>> branch 'master' of git@content-ssh.bibletranslationtools.org:PJenkins/hob_mat_text_reg.git

manifest.json

@@ -1 +1 @@
-{"project":{"id":"mat","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":18},"package_version":7,"target_language":{"name":"Mari (Madang Province)","direction":"ltr","anglicized_name":"Warai","region":"Pacific","is_gateway_language":false,"id":"hob"},"format":"usfm","resource":{"id":"reg"},"translators":["Jenkins Pongiura","MARI"],"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","04-01","04-05","04-07","04-10","04-12","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","06-title","03-title","03-01","03-04","03-07","03-10","03-13","02-07","02-13","02-16","02-17","02-19","02-22","06-01","06-03","06-05","06-08","06-14","06-16","06-19","06-22","06-25","06-27","06-30","06-32","07-title","07-01","07-03","07-06","07-07","07-13","07-18","07-21","07-24","07-26","07-28","08-title","08-01","08-04","08-05","08-08","08-11","08-14","08-16","08-21","08-23","08-26","08-28","08-30","08-33","09-title","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-title","10-01","10-02","10-05","10-08","10-11","10-14","10-16","10-19","10-21","10-26","10-28","10-32","10-34","10-37","10-40","10-42","10-24","11-title","11-04","11-07","11-09","11-11","11-13","11-16","11-18","11-20","11-23","11-25","11-28","12-title","12-01","12-03","12-05","12-07","12-09","12-11","12-13","12-15","12-18","12-19","12-22","12-24","12-26","12-28","12-31","12-33","12-38","12-41","12-43","12-46","13-title","13-01","13-03","13-07","13-10","13-13","13-15","13-16","13-18","13-20","13-22","13-24","13-29","13-31","13-34","13-36","13-44","13-47","13-49","13-51","13-54","14-title","14-01","14-03","14-06","14-08","14-13","14-15","14-16","14-19","14-22","14-25","14-28","14-31","14-34","15-title","15-01","15-04","15-07","15-15","15-18","15-21","15-24","15-27","15-29","15-32","16-title","16-01","16-03","16-05","16-09","16-11","16-13","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-title","18-04","18-12","18-15","18-17","18-18","18-23","18-28","18-30","18-32","18-34","19-title","19-01","19-05","19-07","19-13","19-16","19-18","19-23","19-25","19-28","19-29","20-title","20-01","20-03","19-10","20-05","20-08","20-11","20-13","20-15","20-17","20-20","20-22","20-32","20-29","21-title","21-04","21-06","21-12","21-15","21-18","21-23","21-25","21-28","21-31","21-33","21-35","21-38","21-42","21-43","21-45","22-title","22-01","22-04","22-11","22-13","22-15","22-18","22-20","22-25","22-29","22-31","22-37","22-39","22-41","22-43","22-45","23-title","23-04","23-08","23-11","23-13","23-16","23-20","23-23","23-25","23-27","23-29","23-32","23-34","24-title","24-01","24-03","24-06","24-09","24-12","24-15","24-19","24-23","24-26","24-29","24-30","24-32","24-34","24-36","24-40","24-45","24-48","25-title","25-01","25-05","25-07","25-10","25-14","25-17","25-19","25-22","25-24","25-26","25-37","25-44","26-title","26-01","26-03","26-06","26-10","26-12","26-14","26-17","26-20","26-23","26-26","26-27","26-33","26-36","26-39","26-42","26-45","26-47","26-49","26-51","26-55","26-57","26-59","26-62","26-65","26-67","26-69","26-71","27-title","27-03","27-06","27-09","18-07","18-09","18-10","19-03","21-01","22-05","25-28","25-31","23-37","22-34","27-17","27-20","27-25","27-30","27-32","27-35","27-41","27-43","27-48","27-54","27-65","28-title","28-01","28-16","28-18","28-20","15-12","23-18","25-34","25-41","27-11","27-15","27-23","27-27","27-38","27-45","27-51","27-57","27-59","27-62","28-03","28-05","28-08","28-11","28-14","27-01","26-73","26-30","24-43","24-37","23-06","23-01","22-23","22-08","21-40","21-20","21-09","20-25","19-20","18-26","18-21","18-01","16-17","15-36","15-10","14-10","13-57","13-40","13-33","13-27","12-48","12-42","12-36","11-01","08-18","07-15","07-11","06-11","04-14","04-title","03-16","02-11","02-09","01-01","01-title","01-04","01-07","01-09","02-01","02-title","01-20","01-18","01-15","01-12","01-22","01-24","02-04"]}
+{"project":{"id":"mat","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":18},"package_version":7,"target_language":{"name":"Mari (Madang Province)","direction":"ltr","anglicized_name":"Warai","region":"Pacific","is_gateway_language":false,"id":"hob"},"format":"usfm","resource":{"id":"reg"},"translators":["Jenkins Pongiura","MARI"],"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","04-01","04-05","04-07","04-10","04-12","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","06-title","03-title","03-01","03-04","03-07","03-10","03-13","02-19","02-22","06-01","06-03","06-05","06-08","06-14","06-16","06-19","06-22","06-25","06-27","06-30","06-32","07-title","07-01","07-03","07-06","07-07","07-13","07-18","07-21","07-24","07-26","07-28","08-title","08-01","08-04","08-05","08-08","08-11","08-14","08-16","08-21","08-23","08-26","08-28","08-30","08-33","09-title","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-title","10-01","10-02","10-05","10-08","10-11","10-14","10-16","10-19","10-21","10-26","10-28","10-32","10-34","10-37","10-40","10-42","10-24","11-title","11-04","11-07","11-09","11-11","11-13","11-16","11-18","11-20","11-23","11-25","11-28","12-title","12-01","12-03","12-05","12-07","12-09","12-11","12-13","12-15","12-18","12-19","12-22","12-24","12-26","12-28","12-31","12-33","12-38","12-41","12-43","12-46","13-title","13-01","13-03","13-07","13-10","13-13","13-15","13-16","13-18","13-20","13-22","13-24","13-29","13-31","13-34","13-36","13-44","13-47","13-49","13-51","13-54","14-title","14-01","14-03","14-06","14-08","14-13","14-15","14-16","14-19","14-22","14-25","14-28","14-31","14-34","15-title","15-01","15-04","15-07","15-15","15-18","15-21","15-24","15-27","15-29","15-32","16-title","16-01","16-03","16-05","16-09","16-11","16-13","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-title","18-04","18-12","18-15","18-17","18-18","18-23","18-28","18-30","18-32","18-34","19-title","19-01","19-05","19-07","19-13","19-16","19-18","19-23","19-25","19-28","19-29","20-title","20-01","20-03","19-10","20-05","20-08","20-11","20-13","20-15","20-17","20-20","20-22","20-32","20-29","21-title","21-04","21-06","21-12","21-15","21-18","21-23","21-25","21-28","21-31","21-33","21-35","21-38","21-42","21-43","21-45","22-title","22-01","22-04","22-11","22-13","22-15","22-18","22-20","22-25","22-29","22-31","22-37","22-39","22-41","22-43","22-45","23-title","23-04","23-08","23-11","23-13","23-16","23-20","23-23","23-25","23-27","23-29","23-32","23-34","24-title","24-01","24-03","24-06","24-09","24-12","24-15","24-19","24-23","24-26","24-29","24-30","24-32","24-34","24-36","24-40","24-45","24-48","25-title","25-01","25-05","25-07","25-10","25-14","25-17","25-19","25-22","25-24","25-26","25-37","25-44","26-title","26-01","26-03","26-06","26-10","26-12","26-14","26-17","26-20","26-23","26-26","26-27","26-33","26-36","26-39","26-42","26-45","26-47","26-49","26-51","26-55","26-57","26-59","26-62","26-65","26-67","26-69","26-71","27-title","27-03","27-06","27-09","18-07","18-09","18-10","19-03","21-01","22-05","25-28","25-31","23-37","22-34","27-17","27-20","27-25","27-30","27-32","27-35","27-41","27-43","27-48","27-54","27-65","28-title","28-01","28-16","28-18","28-20","15-12","23-18","25-34","25-41","27-11","27-15","27-23","27-27","27-38","27-45","27-51","27-57","27-59","27-62","28-03","28-05","28-08","28-11","28-14","27-01","26-73","26-30","24-43","24-37","23-06","23-01","22-23","22-08","21-40","21-20","21-09","20-25","19-20","18-26","18-21","18-01","16-17","15-36","15-10","14-10","13-57","13-40","13-33","13-27","12-48","12-42","12-36","11-01","08-18","07-15","07-11","06-11","04-14","04-title","03-16","01-01","01-title","01-04","01-07","01-09","02-01","02-title","01-20","01-18","01-15","01-12","01-22","01-24","02-04"]}