auto save

2021-08-29 12:19:58 +08:00 · 2021-08-29 12:19:58 +08:00 · 45f58c79fa
parent 8eb73399b7
commit 45f58c79fa
7 changed files with 1 additions and 25 deletions
--- a/18/16.txt
+++ b/18/16.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 16 Balalu, Galio ngusir here teka unengan sidang. \v 17 Udi yeru, katuluh here nyama Sostenes, kepala sinagoge, balalu ngakasahni hang hadapan unengan sidang. Kude, Galio puang mamparhati hal- hal yeru.
-=======
 \v 16  Balalu, Galio ngaluar here teka uneng pangadilan. \v 17 Udi yeru, here katuluh nyamma Sostenes, kapala Sinagoge, palus ngakasah ni hang hadapan pangadilan . Kude yeru, Galio puang igaganu pakara yeru.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indobarat/bkr-x-pajuepat_act_text_reg.git
--- a/18/18.txt
+++ b/18/18.txt
@ -1,7 +1,3 @@
-<<<<<<< HEAD
 Paulus Mulek ma Tumpuk Antiokhia

 \v 18 Udi yeru, Paulus muneng papire anrau lagi, balalu paramisi anri kawan ulun parisaya anri tulak balayar ma Siria, sinrah Priskila anri Akwila. Hang Kengkrea, Paulus haut nyukur wuluni daya hanye haut bahajat. \v 19 Udi yeru, here hampe hang Efesus anri Paulus nanan Priskila anri Akwila hang yaru, tapi hanye raerai masuk ma sinagoge anri basurah anri kawan ulun Yahudi.
-=======
-\v 18 Udi yeru, Paulus muneng papire andrau lagi balalu parumisi andri kawan pulaksanai mira iman, balayar ma Siria, sindrah Priskila andri Akwila. Hang Kengkrea, Paulus ngukur wuluni daya hanye haut ba nasar. \v 19 Balalu, here hampe hang Efesus, Paulus nanan Priskila andri Akwila hang yaru, kude hanye raerai masuk ma sinagoge barunding andri kawan ulun Yahudi.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indobarat/bkr-x-pajuepat_act_text_reg.git
--- a/18/20.txt
+++ b/18/20.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 20 Hantek here laku Paulus himpan muneng balawah, Paulus puang narime, \v 21 tapi paramisi anri here nelang  bapander," Aku sagar mulek nunung naun jaka Alatalla ngabahumenni." Anri, hanye balayar teka Efesus.
-=======
-\v 20 Hantek here laku Paulus himpan tau muneng balawah, Paulus puang hakun,  \v 21 tapi parumisi andri here nelang maharek: "Aku sagar mulek lagi nunung naun jaka Alatalla ngaheng." Balalu, hanye balayar teka Efesus.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indobarat/bkr-x-pajuepat_act_text_reg.git
--- a/18/22.txt
+++ b/18/22.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 22 Udi hanye minau hang Kaisarea, hanye mamai nelang ngami tabe ma kawan jemaat, balalu minau ma Antiokhia. \v 23 Anri, udi nangkelah papire waktu hang yaru, hanye nanan unengan yeru balalu bakuliling teka isa unengan ma unengan lainni hang watas Galatia anri Frigia, sambil ngami kakuaten  katuluh murid.
-=======
-\v 22 Udi hanye minau hang Kaisarea, hanye mamai ngami tabe ma ka kawan ungkup, balalu minau ma Antiokia. \v 23 Balalu, udi muneng papire waktu hang yaru, hanye tulak nanan unengan ru, bakaliling teka isa unengan ma unengan lainni hang wilayah Galatia andri Frigia, nelang ngampi segah iman parisaya ma katuluh murid. Apolos hang Kota Efesus andri Kota Korintus
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indobarat/bkr-x-pajuepat_act_text_reg.git
--- a/18/24.txt
+++ b/18/24.txt
@ -1,7 +1,3 @@
-<<<<<<< HEAD
 Apolos hang Tumpuk Efesus anri Tumpuk Korintus 

 \v 24 Wayah katika, naan ulun Yahudi bangaran Apolos turunan Aleksandria, hawi ma Efesus. Hanye erang kaulun pintar nelang paseh  hawuang hal Surat Barasis. \v 25 Ulun yena haut naajar neu Lalan Tuhan anri basumangat hawuang ruh. Hanye bapander nelang ngajar anri taliti neu Yesus, daya hanye ekat karasa baptisan Yohanes. \v 26 Hanye mulai bapaner anri mahi katakuten hawuang sinagoge, kude hantek Priskila anri Akwila nyanrengeini, here narikni ma wading anri manarang ma hanye Lalan Alatalla  sa labih mangana.
-=======
-\v 24 Hang erang katika, naan ulun Yahudi bangaran Apolos, turunan Aleksandria, hawi ma Efesus. Hanye erang kaukun tapalajar, pintar hang wuang pakara Surat Barasis. \v 25 Ulun ti haut na ajar sual lalan Tuhan andri tu'u basumangat  hag wuang ruh. Hanye bapander nelang ngajar andri taliti kawan pakara Yesus, tapi hanye ekat karasa baptisan Yohanes. \v 26 Hanye nuku pander hampe mahi katakutenni hang sinagoge tapi hantek Priskila andri Akwila nyanrengeini, here narikni ma iring balalu ngami panjalasan ma hanye  Lalan Alatalla sa bujur.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indobarat/bkr-x-pajuepat_act_text_reg.git
--- a/18/27.txt
+++ b/18/27.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 27 Anri, hantek Apolos nyubarang ma Akhaya, kawan pulaksanai isa iman  ngami kateguhan atei  ma hanye nelang nyurat ma kawan murid himpan manyambut pihawiaanni. Hantek hanye hampe, hanye hene ngarawah here sa daya karunia haut jari parisaya, \v 28 daya hanye anri kape mambantah kawan ulun Yahudi hang muka ulun rama, saratang nantarang teka Surat Barasih amun Kristus hanyeru Yesus.
-=======
-\v 27 Andri, hantek Apolos hamen nyubarang ma Akhaya, kawan pulaksanai mira iman , ngampi kukuhni andri nyurat ma  kawan murid himpan nyambut pihawianni. Hantek hanye hampe, hanye hene ngarawah here sa daya anugerah haut jari ulun parisaya, \v 28 daya hanye andri karas nantang ulun-ulun Yahudi hang penah ulun rama, nelang nantarang teka Surat Barasis amun Kristus yeru Yesus.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indobarat/bkr-x-pajuepat_act_text_reg.git
--- a/manifest.json
+++ b/manifest.json
@ -1 +1 @@
-{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":4},"package_version":7,"target_language":{"name":"Paju Epat","direction":"ltr","anglicized_name":"Paju Epat","region":"Asia","is_gateway_language":false,"id":"bkr-x-pajuepat"},"format":"usfm","resource":{"id":"reg"},"translators":["awat bandrang","carmelita","awat","elistarman idrus","Pipit_paju4","kastianna liwi ardilend","dinung","Sintaniati","Lukasari","Pipit","RUSNIAWATI","Joses Daud Novaros","pajuepat"],"source_translations":[{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20210520,"version":"1.3"},{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":"2018-01-08T00:00:00+00:00","version":"2016"}],"finished_chunks":["19-title","18-title","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","18-01","front-title","01-title","01-01","01-04","01-06","01-09","01-12","01-15","01-17","01-20","01-21","01-24","02-title","02-01","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","03-title","03-01","03-04","03-07","03-09","03-11","03-13","03-15","03-17","03-19","03-21","03-24","04-title","04-01","04-05","04-08","04-11","04-13","04-15","04-19","04-21","04-23","04-26","04-27","04-29","04-32","04-34","04-36","05-title","05-01","05-03","05-07","05-09","05-12","05-14","05-17","05-19","05-22","05-24","05-26","05-29","05-33","05-35","05-38","05-40","06-title","06-01","06-02","06-05","06-07","06-08","06-10","06-12","07-title","07-01","07-04","07-06","07-09","07-11","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-title","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-title","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-title","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","11-title","11-01","11-04","11-07","11-11","11-15","11-17","11-19","11-22","11-25","11-27","11-29","12-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","13-01","13-04","13-06","13-09","13-11","13-13","13-16","13-19","13-21","13-23","13-26","13-28","13-30","13-32","13-35","13-38","13-40","13-42","13-44","13-46","13-48","13-50","14-title","14-01","14-03","14-05","14-08","14-11","14-14","14-17","14-19","14-21","14-23","14-27","15-title","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","16-title","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-title","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","20-title","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-title","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","22-title","22-01","22-03","22-06","22-09","22-12","22-14","22-17","22-19","22-22","22-25","22-27","22-30","23-title","23-01","23-04","23-06","23-09","23-11","23-12","23-14","23-16","23-18","23-20","23-22","23-25","23-28","23-31","23-34","24-title","24-01","24-04","24-07","24-10","24-14","24-17","24-20","24-22","24-24","24-26","25-title","25-01","25-04","25-06","25-09","25-11","25-13","25-17","25-21","25-23","25-25","26-title","26-01","26-04","26-06","26-09","26-12","26-15","26-19","26-22","26-24","26-27","26-30","27-title","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","28-title","28-01","28-03","28-05","28-07","28-11","28-13","28-16","28-19","28-21","28-23","28-25","28-27","28-28","28-30"]}
+{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":4},"package_version":7,"target_language":{"name":"Paju Epat","direction":"ltr","anglicized_name":"Paju Epat","region":"Asia","is_gateway_language":false,"id":"bkr-x-pajuepat"},"format":"usfm","resource":{"id":"reg"},"translators":["awat bandrang","carmelita","awat","elistarman idrus","Pipit_paju4","kastianna liwi ardilend","dinung","Sintaniati","Lukasari","Pipit","RUSNIAWATI","Joses Daud Novaros","pajuepat"],"source_translations":[{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20210520,"version":"1.3"},{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":"2018-01-08T00:00:00+00:00","version":"2016"}],"finished_chunks":["19-title","18-title","18-04","18-07","18-09","18-12","18-14","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","18-01","front-title","01-title","01-01","01-04","01-06","01-09","01-12","01-15","01-17","01-20","01-21","01-24","02-title","02-01","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","03-title","03-01","03-04","03-07","03-09","03-11","03-13","03-15","03-17","03-19","03-21","03-24","04-title","04-01","04-05","04-08","04-11","04-13","04-15","04-19","04-21","04-23","04-26","04-27","04-29","04-32","04-34","04-36","05-title","05-01","05-03","05-07","05-09","05-12","05-14","05-17","05-19","05-22","05-24","05-26","05-29","05-33","05-35","05-38","05-40","06-title","06-01","06-02","06-05","06-07","06-08","06-10","06-12","07-title","07-01","07-04","07-06","07-09","07-11","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-title","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-title","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-title","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","11-title","11-01","11-04","11-07","11-11","11-15","11-17","11-19","11-22","11-25","11-27","11-29","12-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","13-01","13-04","13-06","13-09","13-11","13-13","13-16","13-19","13-21","13-23","13-26","13-28","13-30","13-32","13-35","13-38","13-40","13-42","13-44","13-46","13-48","13-50","14-title","14-01","14-03","14-05","14-08","14-11","14-14","14-17","14-19","14-21","14-23","14-27","15-title","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","16-title","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-title","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","20-title","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-title","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","22-title","22-01","22-03","22-06","22-09","22-12","22-14","22-17","22-19","22-22","22-25","22-27","22-30","23-title","23-01","23-04","23-06","23-09","23-11","23-12","23-14","23-16","23-18","23-20","23-22","23-25","23-28","23-31","23-34","24-title","24-01","24-04","24-07","24-10","24-14","24-17","24-20","24-22","24-24","24-26","25-title","25-01","25-04","25-06","25-09","25-11","25-13","25-17","25-21","25-23","25-25","26-title","26-01","26-04","26-06","26-09","26-12","26-15","26-19","26-22","26-24","26-27","26-30","27-title","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","28-title","28-01","28-03","28-05","28-07","28-11","28-13","28-16","28-19","28-21","28-23","28-25","28-27","28-28","28-30"]}