From e9b6433861f13445c42246e6fd95d4df32e6d2cc Mon Sep 17 00:00:00 2001 From: Atsam Date: Mon, 1 Feb 2021 14:51:51 +0100 Subject: [PATCH] auto save --- 13/08.txt | 4 ---- 13/13.txt | 4 ---- 14/20.txt | 4 ---- 15/10.txt | 5 ----- manifest.json | 2 +- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/13/08.txt b/13/08.txt index a682b85..ef98290 100644 --- a/13/08.txt +++ b/13/08.txt @@ -1,7 +1,3 @@ \v 8 Kada ghi dami gnen na ndong ba, she ghi bari achi ghin. Nohye a bari na kperek nghe asha gnen she dokha arhabbae. -<<<<<<< HEAD \v 9 A dokhe, “kada ghi toki ahu ko arias, kada ghi mwar, kada ghi yhu yhu, kada ghi bari a tar na ndang,” sussuk a dokhe gne a piri n, “barhii tsanak ghe hanghe ghi barhi chighe” -======= -\v 9 A dokhe, “kada ghi toki ahu ko arias, kada ghi mwar, kada ghi yhu yhu, kada ghi bari a tar na ndang,” sussuk a dokhe gne a piri n, “barhii tsanak ghe hanghe ghi barhi chighe” ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git \v 10 Bar ba a veh ntsenak ghe. Nihum, bar sha dokha. diff --git a/13/13.txt b/13/13.txt index b0503d3..5da4742 100644 --- a/13/13.txt +++ b/13/13.txt @@ -1,6 +1,2 @@ \v 13 Nsit nnanzin tittim, hanghe a nwai, ba mbur shu a yhet ko yhe a yhir; kada nsit nnanzin tokhi a hu/ rhias ko nnanzin sak dami achi mat nbar, kada ghi vuntsi ko mus. -<<<<<<< HEAD \v 14 Mmazini mba Jesu kristo, kada ghi ning zom makhi, azhi ghin barra. -======= -\v 14 Mma zini mba Jesu kristo, kada ghi ning zom makhi, azhi ghin barra. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git diff --git a/14/20.txt b/14/20.txt index 9635dfe..a3d2bbe 100644 --- a/14/20.txt +++ b/14/20.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 20 Kade ghi chya Bawai rhe gnenrhiba. A gnen she aghi yhiezi ni ndong ni huzi bzz. -======= -\v 20 Kade ghi nari chya Bawai rhe gnenrhi ba. A gnen she aghi yhiezi ni ndong ni huzi ba. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git \v 21 Azi yhorhek kede ghi rhi nam, ko ning mankun, ko ghizi dognen hey aghi zizi tsanak ghe a huzi diff --git a/15/10.txt b/15/10.txt index 7271524..855be88 100644 --- a/15/10.txt +++ b/15/10.txt @@ -1,7 +1,2 @@ -<<<<<<< HEAD \v 10 A tsigna rhebbiye, “shini ni gjhin a hurwhap, na syai ya” \v 11 Gjhi ku juma, “yhokhak mba, sussuk ghin. A hurwhap, deni sussuk asyai ayhokhgak gna”. -======= -\v 10 tsigna rhebbiye, “shini ni gjhin a hurwhap, na syai ya” -\v 11 Ghi kuma, “yhokhak mba, sussuk ghin. A hurwhap, deni sussuk asyai ayhokhgak gna”. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_rom_text_reg.git diff --git a/manifest.json b/manifest.json index b6d96f4..b5a0220 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-22","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","01-01","01-04","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-23","16-21","16-19","16-17","16-15","16-12","16-09","16-06","16-03","16-01","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-10","15-08","15-05","15-03","15-01","14-22","14-20","14-18","14-16","14-14","14-12","14-10","14-07","14-05","14-03","14-01","13-13","13-11","13-08","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"]} \ 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-22","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","01-01","01-04","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-23","16-21","16-19","16-17","16-15","16-12","16-09","16-06","16-03","16-01","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"]} \ No newline at end of file