From c50f8b108eea0e23d8af7a0eb8b9279346666a35 Mon Sep 17 00:00:00 2001 From: PJenkins <> Date: Thu, 13 Jun 2024 22:18:55 +1000 Subject: [PATCH] auto save --- 08/27.txt | 4 ---- manifest.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/08/27.txt b/08/27.txt index 1851a0b4..df9c25fe 100644 --- a/08/27.txt +++ b/08/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \v 27Yisu wat kuri gan gikas gihan parat marikum wasak i Sisaria Pilipai. Wasak i nangku raham, rungan gikantui kuri gan, ''Garamsagat ginia Zi wiayah?'' \v 28Kurinai gisuntai gin i hup gan in ginia, ''Hiruk ginia Jon mpururub gan. Ka hiruk ginia, 'Ilaija,' ingka hiruk ginia, Propet basinta gan.' -======= -\v 27 Ari Yesus ago disaipel nenaq eraqim saw Sisariya Filipay gigo uliq amikmiktab tilehad luwiy. Lehad luwad teq Yesus in ago disaipel tisusumun nag, On mataw ya inan nog diq haqsa ne huritay? ham. \v 28 Haqan disaipel bilaqiy, Mataw asor ni ninan Jon mataw huz negyaqta na amatin haqay haqiy. Sa asor ni ninan bilaqay, Ni Elaija haqay haqiy. Sa asor bilaqay, God ago nantut kwaziqta na gigo araq daqag ni haqay haqiy. ->>>>>>> refs/heads/new diff --git a/manifest.json b/manifest.json index 507f3a2c..133fe17c 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":18},"target_language":{"name":"Mari (Madang Province)","direction":"ltr","anglicized_name":"Mari","region":"Pacific","is_gateway_language":false,"id":"hob"},"project":{"id":"mrk","name":"Mark"},"type":{"id":"text","name":"Text"},"resource":{"id":"reg"},"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"},{"language_id":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"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":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"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":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"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"}],"translators":["Mari (Madang)","Wasabamal","amal","g"],"finished_chunks":["front-title","08-27","08-29","08-31","08-33","08-35","08-38","09-01","09-04","09-07","09-09","09-11","09-14","09-17","09-20","09-23","09-26","09-28","09-30","09-33","09-36","09-38","09-40","09-42","09-45","09-47","09-49","10-01","10-05","10-07","10-10","10-13","10-15","10-17","10-20","10-23","10-26","10-29","10-32","10-35","10-38","10-41","10-43","10-46","10-49","10-51","11-01","11-04","11-07","11-11","11-13","11-15","11-17","11-20","11-22","11-24","11-27","11-29","11-31","12-01","12-04","12-06","12-08","12-10","12-13","12-16","12-18","12-20","12-24","12-26","12-28","12-32","12-35","12-38","12-41","12-43","13-01","13-03","13-05","13-07","13-09","13-11","13-14","13-17","13-21","13-24","13-28","13-30","13-33","13-35","14-01","14-03","14-06","14-10","14-12","14-15","14-17","14-20","14-22","14-26","14-28","14-30","14-32","14-35","14-37","14-40","14-43","14-47","14-51","14-53","14-55","14-57","14-60","14-63","14-66","14-69","14-71","15-01","15-04","15-06","15-09","15-12","15-14","15-16","15-19","15-22","15-25","15-29","15-31","15-33","15-36","15-39","15-42","15-45","16-01","16-03","16-05","16-08","16-09","16-12","16-14","16-17","16-19","01-01","01-04","01-07","01-09","01-12","01-14","01-16","01-19","01-21","01-23","01-27","01-29","01-32","01-35","01-38","01-40","01-43","01-45","02-title","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-18","02-20","02-22","02-23","02-25","02-27","03-title","03-01","03-03","03-05","03-07","03-09","03-11","03-13","03-17","03-20","03-23","03-26","03-28","03-31","03-33","04-title","04-01","04-03","04-06","04-08","04-10","04-13","04-16","04-18","04-21","04-24","04-26","04-30","04-33","04-35","04-38","04-40","05-title","05-01","05-03","05-05","05-07","05-09","05-11","05-14","05-16","05-18","05-21","05-25","05-28","05-30","05-33","05-35","05-36","05-39","05-41","06-title","06-01","06-04","06-07","06-10","06-12","06-14","06-16","06-18","06-21","06-23","06-26","06-30","06-33","06-35","06-37","06-39","06-42","06-45","06-48","06-51","06-53","06-56","07-title","07-01","07-02","07-05","07-06","07-08","07-11","07-14","07-17","07-20","07-24","07-27","07-29","07-31","07-33","08-title","07-36","08-05","08-07","08-18","08-16","08-14","08-11","08-20","08-22","08-24"]} \ No newline at end of file +{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":18},"target_language":{"name":"Mari (Madang Province)","direction":"ltr","anglicized_name":"Mari","region":"Pacific","is_gateway_language":false,"id":"hob"},"project":{"id":"mrk","name":"Mark"},"type":{"id":"text","name":"Text"},"resource":{"id":"reg"},"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"},{"language_id":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"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":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"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":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"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"}],"translators":["Mari (Madang)","Wasabamal","amal","g"],"finished_chunks":["front-title","08-29","08-31","08-33","08-35","08-38","09-01","09-04","09-07","09-09","09-11","09-14","09-17","09-20","09-23","09-26","09-28","09-30","09-33","09-36","09-38","09-40","09-42","09-45","09-47","09-49","10-01","10-05","10-07","10-10","10-13","10-15","10-17","10-20","10-23","10-26","10-29","10-32","10-35","10-38","10-41","10-43","10-46","10-49","10-51","11-01","11-04","11-07","11-11","11-13","11-15","11-17","11-20","11-22","11-24","11-27","11-29","11-31","12-01","12-04","12-06","12-08","12-10","12-13","12-16","12-18","12-20","12-24","12-26","12-28","12-32","12-35","12-38","12-41","12-43","13-01","13-03","13-05","13-07","13-09","13-11","13-14","13-17","13-21","13-24","13-28","13-30","13-33","13-35","14-01","14-03","14-06","14-10","14-12","14-15","14-17","14-20","14-22","14-26","14-28","14-30","14-32","14-35","14-37","14-40","14-43","14-47","14-51","14-53","14-55","14-57","14-60","14-63","14-66","14-69","14-71","15-01","15-04","15-06","15-09","15-12","15-14","15-16","15-19","15-22","15-25","15-29","15-31","15-33","15-36","15-39","15-42","15-45","16-01","16-03","16-05","16-08","16-09","16-12","16-14","16-17","16-19","01-01","01-04","01-07","01-09","01-12","01-14","01-16","01-19","01-21","01-23","01-27","01-29","01-32","01-35","01-38","01-40","01-43","01-45","02-title","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-18","02-20","02-22","02-23","02-25","02-27","03-title","03-01","03-03","03-05","03-07","03-09","03-11","03-13","03-17","03-20","03-23","03-26","03-28","03-31","03-33","04-title","04-01","04-03","04-06","04-08","04-10","04-13","04-16","04-18","04-21","04-24","04-26","04-30","04-33","04-35","04-38","04-40","05-title","05-01","05-03","05-05","05-07","05-09","05-11","05-14","05-16","05-18","05-21","05-25","05-28","05-30","05-33","05-35","05-36","05-39","05-41","06-title","06-01","06-04","06-07","06-10","06-12","06-14","06-16","06-18","06-21","06-23","06-26","06-30","06-33","06-35","06-37","06-39","06-42","06-45","06-48","06-51","06-53","06-56","07-title","07-01","07-02","07-05","07-06","07-08","07-11","07-14","07-17","07-20","07-24","07-27","07-29","07-31","07-33","08-title","07-36","08-05","08-07","08-18","08-16","08-14","08-11","08-20","08-22","08-24","08-27"]} \ No newline at end of file