auto save

02/20.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 20  Haqanmo Juda mataw aseseqta na bilaqiy, Uliq 46 nazaq aduganib mataw Tempel ka wazan eraqsa teq kabiy a hi hiqiyaq haqiy. Ta ni kam ezeqmanmo aduganib wazid a ta eraqdaq e?haqiy. \v 21 Naqmo Yesus inmo ahol anan bilaqad in bilam, Tempel ham. \v 22 Nazaq iyan abeb Yesus hodhod hulosim ta eramta nab in ago disaipel gamuk nawa in bilamta na anadin tiqemiy. Anadin emad in God ago gamuk anan helmo haqad teq in Yesus ago gamuk na anan helmo tihaqiymo.
-=======
-\v 20 Haqan Juda mataw aseqta na bilaqiy, uliq 46 nazaq aduganib mataw Tempel ka wazan eraqsa teq kabiy a hi hiyiaq haqiy. Ta ni kam ezeqmanmo aduganib wazid a ta eraqdaq e? haqiy. \v 21 Naqmo Yesus ninmo ahol anan bilaqad in bilam, Tempel ham. \v 22 Nazaq iyan abeb Yesus hodhod ta eramta nab in ago disaipel gamuk nawa  in bilamta na anadin tiqemiy. Anadin emad in God ago gamuk anan helmo haqad teq in Yesus ago gamuk na anan helmo tihaqiymo.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git

manifest.json

@@ -1 +1 @@
-{"project":{"id":"jhn","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Kurum","direction":"ltr","anglicized_name":"","region":"Pacific","is_gateway_language":false,"id":"mlp-x-kurum"},"format":"usfm","resource":{"id":"reg"},"translators":["Bargam","Diyol","Jenkins Pongiura","kurum","k"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"resource_id":"ulb","language_id":"as","date_modified":20161019,"version":"1","checking_level":"3"},{"language_id":"en","resource_id":"ulb","date_modified":20170329,"checking_level":"3","version":"9"},{"resource_id":"udb","language_id":"en","date_modified":20170221,"version":"9","checking_level":"3"}],"finished_chunks":["06-title","12-12","20-title","21-title","08-14","08-12","08-09","08-07","08-04","08-01","08-title","07-53","front-title","01-title","02-title","02-20","02-23","03-title","03-01","03-03","03-05","03-07","03-09","03-12","03-14","03-16","03-19","03-22","03-25","03-27","03-29","03-31","03-34","04-title","04-01","04-04","04-06","04-09","04-11","04-13","04-15","04-17","04-19","04-21","04-23","04-25","04-27","04-28","04-31","04-34","04-37","04-39","04-41","04-43","04-46","04-48","04-51","04-53","05-title","05-01","05-05","05-07","05-09","05-10","05-12","05-14","05-16","05-19","05-21","05-24","05-25","05-26","05-28","05-30","05-33","05-36","05-39","05-41","05-43","05-45","06-01","06-04","06-07","06-10","06-13","06-16","06-19","06-22","06-24","06-26","06-28","06-30","06-32","06-35","06-38","06-41","06-60","06-62","06-64","06-66","06-70","07-title","07-01","07-03","07-05","07-08","07-10","07-12","07-14","07-17","07-19","07-21","07-23","07-25","07-28","07-30","07-33","07-35","07-37","07-39","07-40","07-43","07-45","07-47","07-50","06-43","06-46","06-48","06-50","06-52","06-54","06-57","08-17","08-19","08-21","08-23","08-25","08-28","08-31","08-34","08-37","08-39","08-42","08-45","08-48","08-50","08-52","08-54","08-57","09-title","09-01","09-03","09-06","09-08","09-10","09-13","09-16","09-19","09-22","09-24","09-26","09-28","09-30","09-32","09-35","09-39","10-title","10-01","10-03","10-05","10-07","10-09","10-11","10-14","10-17","10-19","10-22","10-25","10-27","10-29","10-32","10-34","10-37","10-40","11-title","11-01","11-03","11-05","11-08","11-10","11-12","11-15","11-17","11-21","11-24","11-27","11-30","11-33","11-36","11-38","11-41","11-43","11-45","11-47","11-49","11-51","11-54","11-56","12-title","12-01","12-04","12-07","12-09","12-14","12-16","12-17","12-20","12-23","12-25","12-27","12-30","12-32","12-34","12-37","12-39","12-41","12-44","12-46","21-01","21-04","21-07","21-10","21-12","21-15","21-17","21-19","21-20","21-22","21-24","13-title","12-48","13-01","13-03","13-06","13-10","13-12","13-16","13-19","13-21","13-23","13-26","13-28","13-31","13-34","13-36","14-title","14-01","14-04","14-08","14-10","14-12","14-15","14-18","14-21","14-23","14-25","14-28","14-30","15-title","15-01","15-03","15-05","15-08","15-10","15-12","15-14","15-16","15-18","15-20","15-23","15-26","16-title","16-01","16-03","16-05","16-08","16-12","16-15","16-17","16-19","16-22","16-25","16-26","16-29","16-32","17-title","17-01","17-03","17-06","17-09","17-12","17-15","17-18","17-20","17-22","17-24","17-25","18-title","18-01","18-04","18-06","18-08","18-10","18-12","18-15","18-17","18-19","18-22","18-25","18-28","18-31","18-33","18-36","18-38","19-title","19-01","19-04","19-07","19-10","19-12","19-14","19-17","19-19","19-21","19-23","19-25","19-28","19-31","19-34","19-36","19-38","19-40","20-01","20-03","20-06","20-08","20-11","20-14","20-16","20-19","20-21","20-24","20-26","20-28","20-30","01-01","01-04","01-06","01-09","01-10","01-12","01-14","01-16","01-19","01-22","01-24","01-26","01-29","01-32","01-35","01-37","01-40","01-43","01-46","01-49","02-01","02-03","02-06","02-09","02-11","02-12","02-13","02-15","02-17"]}
+{"project":{"id":"jhn","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Kurum","direction":"ltr","anglicized_name":"","region":"Pacific","is_gateway_language":false,"id":"mlp-x-kurum"},"format":"usfm","resource":{"id":"reg"},"translators":["Bargam","Diyol","Jenkins Pongiura","kurum","k"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"resource_id":"ulb","language_id":"as","date_modified":20161019,"version":"1","checking_level":"3"},{"language_id":"en","resource_id":"ulb","date_modified":20170329,"checking_level":"3","version":"9"},{"resource_id":"udb","language_id":"en","date_modified":20170221,"version":"9","checking_level":"3"}],"finished_chunks":["06-title","12-12","20-title","21-title","08-14","08-12","08-09","08-07","08-04","08-01","08-title","07-53","front-title","01-title","02-title","02-23","03-title","03-01","03-03","03-05","03-07","03-09","03-12","03-14","03-16","03-19","03-22","03-25","03-27","03-29","03-31","03-34","04-title","04-01","04-04","04-06","04-09","04-11","04-13","04-15","04-17","04-19","04-21","04-23","04-25","04-27","04-28","04-31","04-34","04-37","04-39","04-41","04-43","04-46","04-48","04-51","04-53","05-title","05-01","05-05","05-07","05-09","05-10","05-12","05-14","05-16","05-19","05-21","05-24","05-25","05-26","05-28","05-30","05-33","05-36","05-39","05-41","05-43","05-45","06-01","06-04","06-07","06-10","06-13","06-16","06-19","06-22","06-24","06-26","06-28","06-30","06-32","06-35","06-38","06-41","06-60","06-62","06-64","06-66","06-70","07-title","07-01","07-03","07-05","07-08","07-10","07-12","07-14","07-17","07-19","07-21","07-23","07-25","07-28","07-30","07-33","07-35","07-37","07-39","07-40","07-43","07-45","07-47","07-50","06-43","06-46","06-48","06-50","06-52","06-54","06-57","08-17","08-19","08-21","08-23","08-25","08-28","08-31","08-34","08-37","08-39","08-42","08-45","08-48","08-50","08-52","08-54","08-57","09-title","09-01","09-03","09-06","09-08","09-10","09-13","09-16","09-19","09-22","09-24","09-26","09-28","09-30","09-32","09-35","09-39","10-title","10-01","10-03","10-05","10-07","10-09","10-11","10-14","10-17","10-19","10-22","10-25","10-27","10-29","10-32","10-34","10-37","10-40","11-title","11-01","11-03","11-05","11-08","11-10","11-12","11-15","11-17","11-21","11-24","11-27","11-30","11-33","11-36","11-38","11-41","11-43","11-45","11-47","11-49","11-51","11-54","11-56","12-title","12-01","12-04","12-07","12-09","12-14","12-16","12-17","12-20","12-23","12-25","12-27","12-30","12-32","12-34","12-37","12-39","12-41","12-44","12-46","21-01","21-04","21-07","21-10","21-12","21-15","21-17","21-19","21-20","21-22","21-24","13-title","12-48","13-01","13-03","13-06","13-10","13-12","13-16","13-19","13-21","13-23","13-26","13-28","13-31","13-34","13-36","14-title","14-01","14-04","14-08","14-10","14-12","14-15","14-18","14-21","14-23","14-25","14-28","14-30","15-title","15-01","15-03","15-05","15-08","15-10","15-12","15-14","15-16","15-18","15-20","15-23","15-26","16-title","16-01","16-03","16-05","16-08","16-12","16-15","16-17","16-19","16-22","16-25","16-26","16-29","16-32","17-title","17-01","17-03","17-06","17-09","17-12","17-15","17-18","17-20","17-22","17-24","17-25","18-title","18-01","18-04","18-06","18-08","18-10","18-12","18-15","18-17","18-19","18-22","18-25","18-28","18-31","18-33","18-36","18-38","19-title","19-01","19-04","19-07","19-10","19-12","19-14","19-17","19-19","19-21","19-23","19-25","19-28","19-31","19-34","19-36","19-38","19-40","20-01","20-03","20-06","20-08","20-11","20-14","20-16","20-19","20-21","20-24","20-26","20-28","20-30","01-01","01-04","01-06","01-09","01-10","01-12","01-14","01-16","01-19","01-22","01-24","01-26","01-29","01-32","01-35","01-37","01-40","01-43","01-46","01-49","02-01","02-03","02-06","02-09","02-11","02-12","02-13","02-15","02-17","02-20"]}