auto save

This commit is contained in:
Jenkins Pongiura 2023-09-06 11:28:59 +10:00 committed by root
parent 97da2833e4
commit 6c38afab8f
3 changed files with 2 additions and 10 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 11 Teq in ago on mataw naw amo amo kazaq nagta.Mataw asor in Aposel akabiyan nag.Sa asor in God ago nantut akabiyan nag.Sa asor in uliq-uliqgo luwad Yesus awagamun dimunta on mataw gibilengo akabiyan nag.Sa asor in God ago sipsip giwamuzgo akabiyan negad in mataw asor God ago gamuk asuleqin bilaqgo akabiyan nag.\v 12 In ago on mataw tawonta na giwaz meqniyeq ago kabiy dimunmo tiqem daqay haqay in naw amo na nagta. Negan in kabiy amo amo emsa Krais anon ayan iyaqta. Ari i bunmo nazaq an ulumsihad kabiy amo amo na emad teq i bunmo ginad helta amulikmo ussa i God atatin ago tuhurit kemam.Hurit kemeq nab i gihol tizilimdaq. Zilimad teq i Krais anon wolnet bugid in bilaqne mat ahol bunmo usaqta nog iyad in anon afaqin inaq tirirendaq.
=======
\v 11 Teq in ago on mataw naw amo amo kazaq nagta. Mataw asor in Aposel akabiyan nag. Sa asor in God ago nantut akabiyan nag. Sa asor in uliq-uliqgo luwad Yesus awagamun dimunta on mataw gibilengo akabiyan nag. Sa asor in God ago sipsip giwamunzgo akabiyan negad in mataw asor God ago gamuk asuleqin bilaqgo akabiyan nag. \v 12 In ago on mataw tawonta na giwaz meqniyeqago kabiy dimunmo tiqem daqay haqad in naw amo amo na nagta. Negan in kabiy zmo amo na emsa Krais anon ayah iyaqta. \v 13 Ari i bunmo nazaq an ulumsihhad kabiy amo amo na emad teq i bunmo ginad helta amulikmo ussa i God atatin ago tuhurit kemam. Hurit kemeq nab i gihol tiziilimdaq. Zilimad teq i Krais anon bunmo usaqta nog iyad in anon afaqin inaq tirirendaq.
>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-gabagsal_eph_text_reg.git
\v 13 \v 11 Teq in ago on mataw naw amo amo kazaq nagta.Mataw asor in Aposel akabiyan nag.Sa asor in God ago nantut akabiyan nag.Sa asor in uliq-uliqgo luwad Yesus awagamun dimunta on mataw gibilengo akabiyan nag.Sa asor in God ago sipsip giwamuzgo akabiyan negad in mataw asor God ago gamuk asuleqin bilaqgo akabiyan nag.\v 12 In ago on mataw tawonta na giwaz meqniyeq ago kabiy dimunmo tiqem daqay haqay in naw amo na nagta. Negan in kabiy amo amo emsa Krais anon ayan iyaqta. Ari i bunmo nazaq an ulumsihad kabiy amo amo na emad teq i bunmo ginad helta amulikmo ussa i God atatin ago tuhurit kemam.Hurit kemeq nab i gihol tizilimdaq. Zilimad teq i Krais anon wolnet bugid in bilaqne mat ahol bunmo usaqta nog iyad in anon afaqin inaq tirirendaq.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 14 I nazaq diq tiqiyeq teq iamun amikta os nog a ta hi iyam. Sa mataw gimileq meqinta nagan gigo suleq katiyta bilaqsa i bilaqne muy kamisib lehsa tim bolad sorsa in haresmo lehaqta nazaq i a hi iyam. Mataw na gimileq iyad yuw hunegsa i huriteq a hi muzinam. \v 15 Haiqgam. I mataw ginan ginad bilaqsa gamuk heltaqmo gibilenam. I nazaq toneq teq i krais anon nog iyeq ayah tiqiy bugamta. Ayah iy bugeq i gifaqin Krais ago towubmo tugwahtiqeq inaq diq tisoqotamta. \v 16 Krais i gifaqin iyim ossa i in abensen ameqnagin teq in ahol anaghan bunmo iyim osauqta. Sa i gifaqin na zaway igsa i kabiy anonnmo emauqta. Emad i bunmo an soqotim araqibmo diq osad i an anan ginad bilaqsa osauqta. I nazaq emad ossa Krais anon na ayah iyad in awaz diq timeqniyaq. Iyim osad iyan ya gamuk ka atoranmo kazaq diq ne gibilenaiq. On mataw God abin a hi huritayta na gigo daq ne hi muziniy haqaiq. On mataw na ginad agadanmo diq iysa in daq hi emnanta kabemmo emayta.
=======
\v 14 In nazaq diq tiqiyeq teq i amun amikta os nog a ta hi iyam. Sa mataw gimileq meqinta nagan gigo suleq katiyta bilaqsa i bilaqne muy kamisib lehsa tim bolad sorsa in haresmo lehaqta nazaq i a hi iyam. Mataw na gilieq iyad yuw hunegsa i huriteq a hi muzinam. \v 15 Haiqgam. I mataw ginan ginad bilaqsa gamuk heltamo gibilenam. I nazaq toneq teq i Krais anon nog iyeq ayah tiqiy bugamta. Ayah iy bugeq i gifaqin Krais ago towubmo tugwahtiqeq inaq diq tisoqotamta. \v 16 Krais i gifaqin iyim ossa i in abensen ameqnagin teq in ahol anaghan bunmo iyim osauqta. Sa i gifaqin na zaway igsa i kabiy anononmo emauqta. Emad i bunmo an soqotim araqibmo diq osad i an anan ginad bilaqsa osauqta. I nazaq emad ossa Krais anon na ayah iyad in awaz diq timeqniyaq.
>>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-gabagsal_eph_text_reg.git

View File

@ -1 +1 @@
{"project":{"id":"eph","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Gabagsal","direction":"ltr","anglicized_name":"","region":"Papua New Guinea ","is_gateway_language":false,"id":"mlp-x-gabagsal"},"format":"usfm","resource":{"id":"reg"},"translators":["gabagsal","PJenkins"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20220324,"version":"21-05"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"}],"finished_chunks":["01-title","06-04","06-05","06-01","06-14","06-12","06-10","06-09","05-13","05-03","05-01","04-11","04-23","04-14","04-17","04-20","04-25","04-28","06-19","06-21","06-23","06-17","05-05","05-08","05-15","04-31","05-18","05-22","05-25","05-28","05-31","05-title","06-title","01-01","01-03","01-05","01-07","01-09","01-11","01-13","01-15","01-17","01-19","01-22","02-title","02-01","02-04","02-08","02-11","02-13","02-17","02-19","03-title","03-01","03-03","03-06","03-08","03-10","03-12","03-14","03-17","03-20","04-title","04-01","04-04","04-07","04-09"]}
{"project":{"id":"eph","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Gabagsal","direction":"ltr","anglicized_name":"","region":"Papua New Guinea ","is_gateway_language":false,"id":"mlp-x-gabagsal"},"format":"usfm","resource":{"id":"reg"},"translators":["gabagsal","PJenkins"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20220324,"version":"21-05"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"}],"finished_chunks":["01-title","06-04","06-05","06-01","06-14","06-12","06-10","06-09","05-13","05-03","05-01","04-23","04-17","04-20","04-25","04-28","06-19","06-21","06-23","06-17","05-05","05-08","05-15","04-31","05-18","05-22","05-25","05-28","05-31","05-title","06-title","01-01","01-03","01-05","01-07","01-09","01-11","01-13","01-15","01-17","01-19","01-22","02-title","02-01","02-04","02-08","02-11","02-13","02-17","02-19","03-title","03-01","03-03","03-06","03-08","03-10","03-12","03-14","03-17","03-20","04-title","04-01","04-04","04-07","04-09","04-14"]}