From a39cbb83cc512ab995b04d63b90175133d0cc21d Mon Sep 17 00:00:00 2001 From: "M.Y.I. Deddy Malik" <> Date: Thu, 13 Sep 2018 09:21:20 +0700 Subject: [PATCH] auto save --- 02/34.txt | 4 ---- 02/37.txt | 5 ----- 02/40.txt | 4 ---- 02/43.txt | 5 ----- 02/46.txt | 5 ----- manifest.json | 2 +- 6 files changed, 1 insertion(+), 24 deletions(-) diff --git a/02/34.txt b/02/34.txt index a784cd9..22aa06d 100644 --- a/02/34.txt +++ b/02/34.txt @@ -1,7 +1,3 @@ \v 34 le'na, Daud bea manyangke ndi Surga, tapi yatuu loloa', \v 35 Sampulo' loloa' ndi Samagat ku : "Duduk ndi atap kato Ku, sampai kupola balanu dari tumpuan nu." Mzm 110:1 -<<<<<<< HEAD \v 36 Lena tuen, biar mang kon langko pa Israel mangatauang Sampulo' amin na man dari ang Ndia dari Sampulo dana Kristus, inyen na Yesus yang isalibpang ngen lenin." -======= -\v 36 Lena tuen, biar mang kon langko pa Israel mangatauang Sampulo' amin na man dari ang Ndia dari Sampulo dana Kristus, inyen na Yesus yang isalibpang ngen lenin." ->>>>>>> refs/heads/new diff --git a/02/37.txt b/02/37.txt index 14ee7f5..3e41581 100644 --- a/02/37.txt +++ b/02/37.txt @@ -1,8 +1,3 @@ \v 37 Mandalinga tuen, asa i ruruk atena kon tilinoen tuu, ira long mangatoanang ndi Petrus dana kon Rasul en tuu, "Kon insamaku, maken ya, kaungka kam asi?" -<<<<<<< HEAD \v 38 Kola'na Petrus ndi ira, "Dari tau mam lah ken, pamandiang dirinin lalam ansan na Yesus untuk ngalapas kon sala' nin, amin na tuen iken ibare Sampiayu. \v 39 Le'na tuen Pokat ten nii bonin dasnas anak ampunin, ibareang bom untukka kon tau ambat yang dao'en, kaambat ta Sampulo' ta kae' manajona. -======= -\v 38 Kola'na Petrus ndi ira, "Dari tau mam lah ken, pamandiang dirinin lalam ansan na Yesus untuk ngalapas kon sala' nin, amin na tuen iken ibare Sampiayu. -\v 39 Le'na tuen Pokat ten nii bonin dasnas anak ampunin, ibareang bom untukka kon tau ambat yang dao'en, kaambat ta Sampulo' ta kae' manajona. ->>>>>>> refs/heads/new diff --git a/02/40.txt b/02/40.txt index 73b7bd4..512a290 100644 --- a/02/40.txt +++ b/02/40.txt @@ -1,7 +1,3 @@ \v 40 Lam ambat loloa'na ndi ira, Petrus totong totong dari saksi dan loloa', kola' na :"Kuati mam mam kalenin nin de kanturan bea mam men nii! " \v 41 Sasoentu, tiga ribu tau i pamandien le'na pacaya ndi loloa'na Petrus. -<<<<<<< HEAD \v 42 Ira mandalinga panampunya rasul-rasul lalam kapulungan na, lam mamala' roti dana lam maapat tang ngen. -======= -\v 42 Ira mandalinga panampunya rasul-rasul lalam kapulungan na, lam mamala' roti dana lam maapat tang ngen. ->>>>>>> refs/heads/new diff --git a/02/43.txt b/02/43.txt index b892154..935cfc4 100644 --- a/02/43.txt +++ b/02/43.txt @@ -1,7 +1,2 @@ \v 43 lena tuen, maleo' kon sumangat ten dan ambat kon beo' dan bo' ajaib dari lam karejana kon rasul. -<<<<<<< HEAD \v 44 Kon tau yang pacaya'en sikapulung dan samua kon bo' dari ampuna tau ambaten tuu. \v 45 Ira mamet kon bo' en tuu long manawa'-nawa' ndi tau ambat en. -======= -\v 44 Kon tau yang pacaya'en sikapulung dan samua kon bo' dari ampuna tau ambaten tuu. -\v 45 Ira mamet kon bo' en tuu long manawa'-nawa' ndi tau ambat en. ->>>>>>> refs/heads/new diff --git a/02/46.txt b/02/46.txt index 62785ca..77da57a 100644 --- a/02/46.txt +++ b/02/46.txt @@ -1,6 +1 @@ -<<<<<<< HEAD \v 46 Insa aso ira sikapulung pa Langko na Sampulo' mamala'-mala' roti de langko ndi langkoen,dana sau sau \v 47 sambil manimang raya, ira mangangkalong ndi Sampulo, maken ambat tau misit dana ira. Insa aso jien kon tau yang amin i selamatkan paambati kapulungannna ira tuu. -======= -\v 46 Insa aso ira sikapulung pa Langko na Sampulo' mamala'-mala' roti de langko ndi langkoen,dana sau sau -\v 47 sambil manimang raya, ira mangangkalong ndi Sampulo, maken ambat tau misit dana ira. Insa aso jien kon tau yang amin i selamatkan paambati kapulungannna ira tuu. ->>>>>>> refs/heads/new diff --git a/manifest.json b/manifest.json index 0b2abe7..a05bc8d 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Dayak Kalis","direction":"ltr","anglicized_name":"","region":"Asia","is_gateway_language":false,"id":"emb-x-kalis"},"format":"usfm","resource":{"id":"reg"},"translators":["M.Y.I. Deddy Malik"],"source_translations":[{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180207,"version":"2016"}],"finished_chunks":["02-18","02-20","02-27","02-29","02-34","02-37","02-40","02-43","02-46"]} \ No newline at end of file +{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Dayak Kalis","direction":"ltr","anglicized_name":"","region":"Asia","is_gateway_language":false,"id":"emb-x-kalis"},"format":"usfm","resource":{"id":"reg"},"translators":["M.Y.I. Deddy Malik"],"source_translations":[{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180207,"version":"2016"}],"finished_chunks":["02-18","02-20","02-27","02-29"]} \ No newline at end of file