auto save

01/03.txt

@@ -1,4 +1,4 @@
 \v 3 Ntantsi bawai mi ghen nsussuk makhi hey nrhignag rhabbin, 
 \v 4 Nkognarha makhi, manayis mi ngheg ghin sussuk ni kenipi 
 \v 5 Rihe fyaci ghin ntito bin rhuzhi nwai timi yhezhi karbini 
-\v 6 Nda tai whang nyhie gnenu gno, ye nahye a timi titti chya ngheg ghinnu arhi kunyan akainya har Yezhin wai Jesu Kristo
+\v 6 Nda tai whang nyhie gnenu gno, ye nahye a timi titti chya ngheg ghinnu arhi kunyan akainya har Yezhin wai Jesu Kristo

01/09.txt

@@ -1,3 +1,3 @@
 \v 9 Ngo ghe manayis ni ye bar ghin a wai khankhan nyhini ni du chi 
 \v 10 Rheye ghi sherhi ni gnen hey atittim, don ghi zhiz rhiyhin ba aveh zhi zhi har nwai kristo 
-\v 11 Shani ni a sarhai zhizhi hay gghi sit nnanzhin jesu kristo dazhinyhoklak na bawai
+\v 11 Shani ni a sarhai zhizhi hay gghi sit nnanzhin jesu kristo dazhin yhoklak na bawai

02/25.txt

@@ -1,3 +1,3 @@
 \v 25 Mma nmarak ghe azhi yhorhek nhara epaphroditus akut yhezhi ngheg ghin kuma. A stenak mi akuk a yhuendi chya a yhuendi rwazhi tin, tsen haa chya ghin kung na yari mi.
 \v 26 Asok sak shoshiti aghi barhi asho ngghin sussuk, don geh ghi karhak ye azhii ni kukun. 
-\v 27 Aye rhiyhin azhini kukun kachim ma ahu. Mma bawai barki gna, ba kagle ba, mma har ni mi ma, rhe yekede nsok uwampinchi uwampi ba.
+\v 27 Aye rhiyhin azhini kukun kachim ma ahu. Mma Bawai barki gna, ba kagle ba, mma har ni mi ma, rhe yekede nsok uwampinchi uwampi ba.

02/28.txt

@@ -1,3 +1,7 @@
 \v 28 Rhehum aghi barhi ba nari makhi nghi haa gna, don ghi tsa gna kuma ghi sok kenipi, mi kuma uwami pi mi a tsanzhin.
 \v 29 Sheni epaphroditus nyhie mbangiji ni kenipi du. Yhokhak in asyai hange geh. 
-\v 30 A rhe chya kristo ayhe kparek ni wur. A ning chigna nko tsas ko wur. Nchya mi asha gnen she ghin ghi mangor zhizhim nchya gheg mi.
+<<<<<<< HEAD
+\v 30 A rhe chya kristo ayhe kparek ni wur. A ning chigna nko tsas ko wur. Nchya mi asha gnen she ghin ghi mangor zhizhim nchya gheg mi.
+=======
+\v 30 A rhe chya kristo ayhe kparek ni war. A ning chiga nko tsas ko wur Nchya mi asha gnen she ghin ghi mangor zhizhim nchya gheg mi.
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git

03/08.txt

@@ -1,4 +1,10 @@
+<<<<<<< HEAD
 \v 8 Kaii mi ma kabini nhurhak kognarha gnen a huzhi rhe khakhan yhini na kristo Jesu Mbangiji mi. Rhabba ndeg kognarha gnen-nhurhak ghen a vasim-rhe ye nsok Kristo  
 \v 9 Asok mi nyhie gna, ba mi nsok sarhai ndokha ba, mma gnen she arhu nrhiyhin nkristo sarhai hay a rhu ngheg Bawai nnanzhin rhiyhin 
 \v 10 Rhehum kabana nghi barhi nchi gna ni ghigbar nyuzhi gna nshisho ni nghe nyarak gna, nshomi hange ghe nwar gna, 
-\v 11 Ko ka nne dei Nnyu nshok yhini Nnyuzhi gna rhuzhi nwur.
+=======
+\v 8 Ai mi ma kabini nhurhak kognarha gnen a huzhi rhe khakhan yhini na kristo Jesu Mbangiji mi. Rhabba ndeg kognarha gnen-nhurhak ghen a vasim-rhe ye nsok Kristo  
+\v 9 Asok mi nyhie gna, ba mi nsok sarhai ndokha ba, mma gnen she arhu nrhiyhin nkristo sarhai hay a rhu ngheg Bawai nnanzhin rhiyhin 
+\v 10 Rhehum kabininghi barhi nchi gna ni ghigbar nyuzhi gna nshisho ni nghe nyarak gna, nshomi hange ghe nwar gna, 
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git
+\v 11 Ko ka nne dei Nnyu nshok yhini Nnyuzhi gna rhuzhi nwur.

04/01.txt

@@ -1,3 +1,7 @@
 \v 1 Karherhum, ananak mi nohye nghi bartri ghen, kenipi mi ni rawani, karherhum samini ni ghigbar ngheg mbangiji, ayhuenedi bar 
 \v 2 Nghi yhai ni euodia, ni syntyche, ghi shoni loppi ndong nyhic mbangiji. 
-\v 3 I, nzanak ghin, ananak chya mina rhiyhin, ghi barki a huegne hay azhi Chaya mi na rihiyhiyin, ghi barki a hne gne hay azhi Chaya nmi nhurhak tittibin, ni chamant na shorhak a yhuendi chya mi, nohye asak ghen ajen nwar wang na tsas.
+<<<<<<< HEAD
+\v 3 I, nzanak ghin, ananak chya mina rhiyhin, ghi barki a huegne hay azhi Chaya mi na rihiyhiyin, ghi barki a hne gne hay azhi Chaya nmi nhurhak tittibin, ni chamant na shorhak a yhuendi chya mi, nohye asak ghen ajen nwar wang na tsas.
+=======
+\v 3 Ill, nzanak ghin, ananak chya mina rhiyhin, ghi barki a huegne hay azhi Chaya mi na rihiyhiyin, ghi barki a hne gne hay azhi Chaya nmi nhurhak tittibin, ni chamant na shorhak a yhuendi chya mi, nohye asak ghen ajen nwar wang na tsas.
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git

04/04.txt

@@ -1,4 +1,8 @@
 \v 4 Zhini kenipingheg ghe mbangiji nkognarhag makhi, nkut rhab zhinikenipi 
 \v 5 Deni shitipi ghine asyai achi sussuk. Mbangiji yheh kperek.
 \v 6 Kede ghi kochi rhe kograrha gnen 	Nnyuhum, nkognarha gnen nmanayis ni yheki ni ten, mitsa ni bawai agnen she ghi barki ghen, 
-\v 7 Kenipina bawai, hay akyuni kognarha yhini aghi rong aloppi ghin ni amarak ghin nkristo jesu
+<<<<<<< HEAD
+\v 7 Kenipina bawai, hay akyuni kognarha yhini aghi rong aloppi ghin ni amarak ghin nkristo jesu
+=======
+\v 7 Kenipina Bawai, hay akyuni kognarha yhini aghi rong aloppi ghin ni amarak ghin nkristo Jesu
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git

04/08.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \v 8 Nkaiyin, ananak, du gnen hay arhiyhin , du gnen hay a tittim, du gnen hay daidai, du gnen hay affifatsagim, du gnen hay a bar, du gnen hay a titti hurak, ajene ada gnen hay a yhorhek, ajene hay a yhokhak, marak ni rhe agnignene gne.
-\v 9 Agnen  hay ghi mansti ghi she ghi karhak ghi tsa nheg mi zhini agnen gne, bawaui ye kempi ajen ni nghin.
+=======
+\v 8 Nkaiyim, ananak, du gnen hay arhiyhin , du gnen hay a tittim, du gnen hay daidai, du gnen hay affifatsagim, du gnen hay a bar, du gnen hay a titti hurak, ajene ada gnen hay a yhorhek, ajene hay a yhokhak, marak ni rhe agnignene gne.
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git
+\v 9 Agnen  hay ghi mansti ghi she ghi karhak ghi tsa nheg mi zhini agnen gne, bawaui ye kempi ajen ni nghin.

04/10.txt

@@ -1,4 +1,8 @@
 \v 10 Nda keni pi ni khankhan ngheg mbangiji rhe ye kabini ghi kut din na marak ghin ngheg mi. kahange ghi yede dama ghi zhiz, mm aba ghi sok makhi ghi barki ba .
  \v 11 Ba nghi rhab hu ye don ghe ndamayari ba . mi nmantsi sho ni ten nkognarhag muzhi gnen . 
+<<<<<<< HEAD
 \v 12 Nci sho yhuamzhi, nkut nchi sho damin khankham. Nkognarha nanzhi ni nkognarha gnen nmantsi sho na rhi tittin ni sho ni kpom, ni damin ni khankhan ko kuma nyarim. 
-\v 13 Nnyu nzhi kognarhar gnen ni kristo hay agni nizhi mi ghigbar .
+=======
+\v 12 Nci sho yhuamzhi, nkut nchi sho damin khankham. Nkognarha nanzhi ni nkognarha gnen nmantsi sho na rhi tittin ni sho ni kpom, ni damin ni khankhan ko kuma nyarim.
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git
+\v 13 Nnyu nzhi kognarhar gnen ni kristo hay agni nizhi mi ghigbar .

04/14.txt

@@ -1,4 +1,11 @@
+<<<<<<< HEAD
 \v 14 Nihum, ghi zhi yhorhek she ghi fya wok nin mi ngye shu wahala.
 \v 15 Ghin a Filibiyawa ghi gi ye in tutumi titi bin, makhi noshe ndak Makidoniya, ba Ekklesiya noshe a barkhi me in bangare nizim ni shyezim sai ka ghin.
 \v 16 Har ma in makhi noshe in zi ghin Tassalonika, ghi han mi ni barkhi fiye ni ndong.
-\v 17 Ba waiye in gyari barkhi ba. Mma, in gyari a mankun noshe aghi wai ghin ryi kunyan.
+\v 17 Ba waiye in gyari barkhi ba. Mma, in gyari a mankun noshe aghi wai ghin ryi kunyan.
+=======
+\v 14 Nihum, ghi zhi yhorhek she ghi barki mi nghe shu wuya mi. 
+\v 15 Ghin a Filibiyawa ghi ni ryamzi ye ntumi titibin, makhi she ndag Makidonia, ba Pok titibin she a barki me npanni nizim ni shezim sai ka ghin. 
+\v 16 Makhi she nzi ghi Tasalonika.ghi hammi ni barki ba ka kadong ba.
+\v 17 Ba wai ye ngyari barki ba. Mma, a mankun she aghi shogan riba ghin.
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git

04/18.txt

@@ -1,3 +1,9 @@
+<<<<<<< HEAD
 \v 18 In she ho nyerak yen sussuk, kuma fiye ni hum ma. Nsok ka Lankan nshogho ma she inshye nwok Epaphroditus a nyinyen noshe ghi nhya ghan. aye tar kamshi, sadaka she Bawai shye gna.
 \v 19 Bawai mi ghi chwan chin a bukatu ghin bisa gha damim gna in ghe Kristo Jesu.
-\v 20 Kabini ngheg bawai ni mba mat asok yhokhak na din din din ni din din din, ashohum.
+\v 20 Kabini ngheg bawai ni mba mat asok yhokhak na din din din ni din din din, ashohum.
+=======
+\v 18 Nshe ho nyarak nyan had ni wai. Nsok barki kabini ma she nshe nghe ghe Epaphroditus a nyinyen she ghi hazak me nin gan. Aye nyen kanshi, sadaka she Bawai Sheri nghe.
+\v 19 Bawai mi ghi chwan din a bukatu ghin bisa ga damim nha yhokhak nha n  Kristo Jesu.
+\v 20 Kabini ngheg bawai ni mba ma he . t asok yhokhak na din din din ni din din din, ashohum.
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git

04/21.txt

@@ -1,4 +1,8 @@
 \v 21 Sarini sussuk affifatsak asyai nyhie kristo jesu. Ananak nahye ajen ni mmi aghi sari ghin.
 \v 22 Sussuk affifatsak asyai nahye ajen manu aghi sarighin, titiba nohye arhu ghirha cacsar.
+<<<<<<< HEAD
 
-\v 23 Barkhi Jesu Kristo asho nha Rhum bin.
+\v 23 Barkhi Jesu Kristo asho nha Rhum bin.
+=======
+\v 23 Barki mbangiji Jesu Kristo asho na rhum bin.
+>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git

manifest.json

@@ -1 +1 @@
-{"project":{"id":"php","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"}],"finished_chunks":["01-28","01-25","01-22","01-20","01-18","01-15","01-12","01-09","01-07","01-03","01-01","front-title","01-title","02-title","02-01","02-03","03-title","04-title","04-21","04-18","04-14","04-10","04-08","04-04","04-01","03-20","03-17","03-15","03-12","03-08","03-06","03-04","03-01","02-28","02-25","02-22","02-19","02-17","02-14","02-12","02-09","02-05"]}
+{"project":{"id":"php","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"}],"finished_chunks":["01-28","01-25","01-22","01-20","01-18","01-15","01-12","01-07","01-01","front-title","01-title","02-title","02-01","02-03","03-title","04-title","04-21","04-18","04-14","04-10","04-08","04-04","04-01","03-20","03-17","03-15","03-12","03-08","03-06","03-04","03-01","02-28","02-22","02-19","02-17","02-14","02-12","02-09","02-05"]}