From 6a60d0e222e3fc356e6659468d6071f83d4cff8e Mon Sep 17 00:00:00 2001 From: Atsam Date: Mon, 1 Feb 2021 14:53:29 +0100 Subject: [PATCH] auto save --- 02/25.txt | 5 ----- 02/28.txt | 5 ----- 03/05.txt | 5 ----- 03/title.txt | 4 ---- manifest.json | 2 +- 5 files changed, 1 insertion(+), 20 deletions(-) diff --git a/02/25.txt b/02/25.txt index c59b7fe..f21347c 100644 --- a/02/25.txt +++ b/02/25.txt @@ -1,8 +1,3 @@ \v 25 Shuu ada way nghea nosho a tokhi dokha,mma ajene ghi yhi pahgi dokha, shuu ghe ashonga sak shuu. -<<<<<<< HEAD \v 26 A jene yhe sak shuu a okhi dokha hange aghi bari nga sak shuu nga ba'a shuu ba? \v 27 Kuma noshe ntutumi aye Sak shuu a muzzi ghe guk O'Hare a tokhi dokha? ngho arhe ghi dam dokha noshe a whor gna ni shuu, mma ghi baw dokha! -======= -\v 26 A jene yhe sak shuu a okhi dokha hange aghi bari nga sak shuu nga ba gyu a shuu -\v 27 Yeah sak shuu aghi tau he injenden a toki doka ba? Saboda ghi da doka ni shuu ama ba ghi Tokyi a ba. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git diff --git a/02/28.txt b/02/28.txt index 5516346..0935a3c 100644 --- a/02/28.txt +++ b/02/28.txt @@ -1,7 +1,2 @@ -<<<<<<< HEAD \v 28 Kuma ghe ba'a Bayawude ba na mizak ghi tuo ba; ko Kuma shuu na ghi tuo in zom. \v 29 Mma ghe a Bayawude gna in gye, Kuma shuu gna ana lop pi, in Rhum, ba in war ba. Yokhak Syei gno ba aghi rus bye Syei ba mma ruzi Bawai -======= -\v 28 Ba'a Bayahude re shuu a na ghi to ba; humbe kuma shuu noshe aka ghi to in zom. -\v 29 Mma a Bayahude noshe azi in gye, kuma shuu ana lop pi, in Rhum, ba in Wor ba. Yhokak Yiri Sai nho ba aghi rus in ye Sai ba sai dai in gyeghe Bawai. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git diff --git a/03/05.txt b/03/05.txt index 9cfe6b5..2f100b3 100644 --- a/03/05.txt +++ b/03/05.txt @@ -1,8 +1,3 @@ -<<<<<<< HEAD \v 5 Mma ajene sak sarkhai mat a mitsak sarhai bawai, be nrhiabbenne? My nrhidat \v 6 Bawai bad a sanhai bas hi-e abandamat muss gna yhe achi mat da? (nzibin haghe syai). Kada hum aziba nihum Bawai ghi gyala abin yhingo nne? -======= -\v 5 Mma ajene sak sarkhai mat a mitsak sarhai bawai, be nrhiabbenne? My nrhidat Bawai bad a sanhai bas hi-e abandamat muss gna yhe achi mat da? (nzibin haghe syai). -\v 6 Kada hum aziba nihum Bawai ghi gyala abin yhingo nne? ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git diff --git a/03/title.txt b/03/title.txt index 95f0841..3f16c0d 100644 --- a/03/title.txt +++ b/03/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kharak Na 3 -======= Kharak 3 ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git diff --git a/manifest.json b/manifest.json index e1a3e39..c66b80f 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"rom","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Atsam","direction":"ltr","anglicized_name":"Atsam","region":"Africa","is_gateway_language":false,"id":"cch"},"format":"usfm","resource":{"id":"reg"},"translators":["Atsam"],"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":["01-title","front-title","02-title","01-07","01-08","01-11","01-13","01-16","01-18","01-20","01-24","01-26","01-28","01-29","01-32","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-21","03-title","04-title","05-title","11-35","11-33","11-30","11-28","11-26","11-25","11-17","11-15","11-13","11-11","11-09","11-04","10-20","10-19","10-18","10-16","10-14","10-11","10-08","10-06","10-04","10-01","09-30","03-07","03-05","03-03","03-01","12-title","13-title","14-title","15-title","16-title","16-27","16-25","16-21","16-19","16-17","16-15","16-12","16-09","16-06","16-03","15-33","15-30","15-28","15-26","15-24","15-22","15-20","15-17","15-15","15-14","15-13","15-12","15-08","15-05","15-03","15-01","14-22","14-18","14-16","14-14","14-12","14-10","14-07","14-05","14-03","14-01","13-11","13-06","13-03","13-01","12-19","12-17","12-14","12-11","12-09","12-06","12-04","12-03","11-22","11-19","09-25","09-22","09-17","09-10","09-08","08-37","08-35","08-33","08-31","08-28","08-26","08-23","08-20","08-18","08-16","08-14","08-12","08-11","07-24","07-22","07-17","07-15","07-13","07-11","07-09","07-07","07-06","07-04","07-02","07-01","06-22","06-19","06-17","06-15","06-12","06-10","06-08","06-06","06-04","06-01","05-06","05-03","05-01","04-23","04-20","04-18","04-16","04-13","04-11","04-09","04-06","04-04","04-01","03-31","03-29","03-27","03-25","03-23","03-21","03-19","03-15","03-13","03-11","03-09","02-23","02-25","02-28","08-01","08-03","08-09","05-08","05-10","05-12","05-14","05-20","15-10","16-01","16-23","01-01","01-04","01-22"]} \ No newline at end of file +{"project":{"id":"rom","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Atsam","direction":"ltr","anglicized_name":"Atsam","region":"Africa","is_gateway_language":false,"id":"cch"},"format":"usfm","resource":{"id":"reg"},"translators":["Atsam"],"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":["01-title","front-title","02-title","01-07","01-08","01-11","01-13","01-16","01-18","01-20","01-24","01-26","01-28","01-29","01-32","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-21","04-title","05-title","11-35","11-33","11-30","11-28","11-26","11-25","11-17","11-15","11-13","11-11","11-09","11-04","10-20","10-19","10-18","10-16","10-14","10-11","10-08","10-06","10-04","10-01","09-30","03-07","03-03","03-01","12-title","13-title","14-title","15-title","16-title","16-27","16-25","16-21","16-19","16-17","16-15","16-12","16-09","16-06","16-03","15-33","15-30","15-28","15-26","15-24","15-22","15-20","15-17","15-15","15-14","15-13","15-12","15-08","15-05","15-03","15-01","14-22","14-18","14-16","14-14","14-12","14-10","14-07","14-05","14-03","14-01","13-11","13-06","13-03","13-01","12-19","12-17","12-14","12-11","12-09","12-06","12-04","12-03","11-22","11-19","09-25","09-22","09-17","09-10","09-08","08-37","08-35","08-33","08-31","08-28","08-26","08-23","08-20","08-18","08-16","08-14","08-12","08-11","07-24","07-22","07-17","07-15","07-13","07-11","07-09","07-07","07-06","07-04","07-02","07-01","06-22","06-19","06-17","06-15","06-12","06-10","06-08","06-06","06-04","06-01","05-06","05-03","05-01","04-23","04-20","04-18","04-16","04-13","04-11","04-09","04-06","04-04","04-01","03-31","03-29","03-27","03-25","03-23","03-21","03-19","03-15","03-13","03-11","03-09","02-23","08-01","08-03","08-09","05-08","05-10","05-12","05-14","05-20","15-10","16-01","16-23","01-01","01-04","01-22","03-05"]} \ No newline at end of file