From 258851a9237fc2d83bc73c7971fb16f9c611e759 Mon Sep 17 00:00:00 2001 From: siswati2023 Date: Thu, 5 Jan 2023 08:50:48 +0200 Subject: [PATCH] Thu Jan 05 2023 08:50:47 GMT+0200 (South Africa Standard Time) --- 01/01.txt | 6 +---- 01/03.txt | 6 +---- 01/05.txt | 6 +---- 01/08.txt | 6 +---- manifest.json | 73 +++++++++++++++++++++++++++------------------------ 5 files changed, 43 insertions(+), 54 deletions(-) diff --git a/01/01.txt b/01/01.txt index b1d6d21..10b64bc 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Pawula, umpostoli waKristu Jesu ngekwentsandvo yaNkulunkulu, naThimothi mzalwane wetfu, ebandleni laNkulunkulu lelise Korinthe, nakubobonkhe bantfu baNkulunkulu labangcwele labakusosonkhe sifundza sase-Akhaya. \v 2 Shangatsi umusa angaba kuwe nekuthula lokuchamuka kuNkulunkulu Babe wetfu neNkhosi Jesu Khristu. -======= -\c 1 \v 1 Pawula, umphostoli waKhristu Jesu ngekwentsandvo yaNkulunkulu, naThimothi umnaketfu, kulo liBandla laNkulunkulu leliseKhorinte, nakubo bonke bantfu baNkulunkulu labangcwele labasesifundzeni saseAkhaya. \v 2 Shangatsi umusa ungaba kini nekuthula lokuvela kuNkulunkulu longuBabe wetfu neNkhosi Jesu Khristu. ->>>>>>> c8c94afaf2df65a89adaa59e32bd5f633d57d5e9 +\c 1 \v 1 Pawula, umpostoli waKristu Jesu ngekwentsandvo yaNkulunkulu, naThimothi mzalwane wetfu, ebandleni laNkulunkulu lelise Korinthe, nakubobonkhe bantfu baNkulunkulu labangcwele labakusosonkhe sifundza sase-Akhaya. \v 2 Shangatsi umusa angaba kuwe nekuthula lokuchamuka kuNkulunkulu Babe wetfu neNkhosi Jesu Khristu. \ No newline at end of file diff --git a/01/03.txt b/01/03.txt index 9020232..9dd7805 100644 --- a/01/03.txt +++ b/01/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Akabongwe Nkulunkulu naBabe weNkhosi yetfu Jesu Khristu. Ungu Babe wemusa naNkulunkulu wayo yonkhe indvudvuto. \v 4 Nkulunkulu uyasidvudvuta kutotonkhe tinhlupheko tetfu, kuze natsi sidvudvute labo labakunome nguyiphi inhlupheko. Sidvudvute labanye ngayoyona lendudvuto leyasebentiswa nguNkulunkulu kusidvudvuta. -======= -\v 3 Shangatsi Nkulunkulu neYise weNkhosi Jesu Khristu angadvunyiswa. UnguYise webubele naNkulunkulu wendvudvuto yonkhe. \v 4 Nkulunkulu usidvudvuta kuto tonkhe tinhlupheko tetfu, kute natsi sitewudvudvuta labo labahlupheka nanoma ngani. Sidvudvuta labanye ngayo leyo ndvudvuto Nkulunkulu layisebentisile kusidvudvuta ngayo. ->>>>>>> c8c94afaf2df65a89adaa59e32bd5f633d57d5e9 +\v 3 Shangatsi Nkulunkulu neYise weNkhosi Jesu Khristu angadvunyiswa. UnguYise webubele naNkulunkulu wendvudvuto yonkhe. \v 4 Nkulunkulu usidvudvuta kuto tonkhe tinhlupheko tetfu, kute natsi sitewudvudvuta labo labahlupheka nanoma ngani. Sidvudvuta labanye ngayo leyo ndvudvuto Nkulunkulu layisebentisile kusidvudvuta ngayo. \ No newline at end of file diff --git a/01/05.txt b/01/05.txt index d500632..87439e2 100644 --- a/01/05.txt +++ b/01/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Njengaloku letinhlupheko taKhristu tikhonela tsine, kanjalo nekudvudvuteka kwetfu kukhona nga Khristu. \v 6 Kepha uma sihlupheka, kungenca yekudvudvuta kwakho nensindziso yakho; futsi uma sidvudvutiwe,kungenca yendvudvuto yakho. kudvudvuteka kwakho kusebenta ngemandla uma uhlephulela ngesineke labasekuhluphekeni kunye lesihlupheka nabo. \v 7 Litsemba letfu mayelana nawe alinyakatiswa, ngoba siyati kutsi uma usahlephula ngetinhlupheko, nawe futsi uhlephula indvudvuto yetfu. -======= -\v 5 Ngako njengobe tinhlupheko tivama ngenca yetfu, ngalokunjalo nekudvudvuteka kwetfu kuyavama ngaye Khristu. \v 6 Kodvwa uma sicindzetelwa, kukwekudvudvuteka nekusindziswa kwenu; futsi uma sidvudvutwa, kukwendvudvuto yenu. Indvudvuto yenu isebenta ngemphumelelo nanihlanganyela ngekubeketela kuto tona leto tinhlupheko lesikuto natsi. \v 7 Litsemba letfu macondzana nani alinyakatiswa, ngobe siyati kutsi njengobe nihlanganyela etinhluphekweni , niyahlanganyela futsi nasekudvudvutekeni kwetfu. ->>>>>>> c8c94afaf2df65a89adaa59e32bd5f633d57d5e9 +\v 5 Ngako njengobe tinhlupheko tivama ngenca yetfu, ngalokunjalo nekudvudvuteka kwetfu kuyavama ngaye Khristu. \v 6 Kodvwa uma sicindzetelwa, kukwekudvudvuteka nekusindziswa kwenu; futsi uma sidvudvutwa, kukwendvudvuto yenu. Indvudvuto yenu isebenta ngemphumelelo nanihlanganyela ngekubeketela kuto tona leto tinhlupheko lesikuto natsi. \v 7 Litsemba letfu macondzana nani alinyakatiswa, ngobe siyati kutsi njengobe nihlanganyela etinhluphekweni , niyahlanganyela futsi nasekudvudvutekeni kwetfu. \ No newline at end of file diff --git a/01/08.txt b/01/08.txt index ee49f70..8249298 100644 --- a/01/08.txt +++ b/01/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Ngoba asifuni nibe yintfo yinye, bazalwane, ngaletinkinga lesaba nato e-Asiya. Sasicilwa saphela ngalokungetulu kwemandla etfu singeke sabuyiseleka ngisho nasemphilweni. \v 9 Ngempela, sasinesijubo sekufa etikwetfu. Kepha loko kwasenta kutsi singabeki litsemba kitsi, esikhundleni silibeke kuNkulunkulu, lovusa labafile. \v 10 Wasikhukulula engotini lebulalako, futsi usetawusikhulula. -======= -\v 8 Kanjalo asitsandzi kutsi singanatisi, bazalwane, ngetinhlupheko lesabanato eAsiya. Sacindzeteleka kakhulu nangalokungetulu kwemandla etfu kangangekutsi sase siphelelwe ngisho nalitsemba lekuphila. \v 9 Ngempela, sase sincunyelwe kutsi sife. Kodvwa loko kwakukwekusenta kutsi singalibeki litsemba letfu kitsi, kodvwa esikhundleni saloko silibeke kuNkulunkulu, lovusa labafile. \v 10 Wasikhulula kuleyo ngoti yekufa, nanyalo utasikhulula. Kuye sibake litsemba kutsi uyawusikhulula. ->>>>>>> c8c94afaf2df65a89adaa59e32bd5f633d57d5e9 +\v 8 Ngoba asifuni nibe yintfo yinye, bazalwane, ngaletinkinga lesaba nato e-Asiya. Sasicilwa saphela ngalokungetulu kwemandla etfu singeke sabuyiseleka ngisho nasemphilweni. \v 9 Ngempela, sasinesijubo sekufa etikwetfu. Kepha loko kwasenta kutsi singabeki litsemba kitsi, esikhundleni silibeke kuNkulunkulu, lovusa labafile. \v 10 Wasikhukulula engotini lebulalako, futsi usetawusikhulula. \ No newline at end of file diff --git a/manifest.json b/manifest.json index d97f774..fa420ad 100644 --- a/manifest.json +++ b/manifest.json @@ -35,42 +35,15 @@ "translators": [ "Mangaliso Maseko", "Sicelo Ntshangase", - "Luciano Duarte" + "Luciano Duarte", + "siswati2023" ], "finished_chunks": [ "01-title", - "11-01", - "11-03", - "11-05", - "11-07", - "11-10", - "11-12", - "11-14", - "11-16", - "11-19", - "11-22", - "11-24", - "11-27", - "11-30", - "11-32", - "12-title", - "12-01", - "12-03", - "12-06", - "12-08", - "12-11", - "12-14", - "12-16", - "12-19", - "12-20", - "13-title", - "13-01", - "13-03", - "13-05", - "13-07", - "13-09", - "13-11", - "13-13", + "01-01", + "01-03", + "01-05", + "01-08", "02-title", "02-01", "02-03", @@ -149,6 +122,38 @@ "10-13", "10-15", "10-17", - "11-title" + "11-title", + "11-01", + "11-03", + "11-05", + "11-07", + "11-10", + "11-12", + "11-14", + "11-16", + "11-19", + "11-22", + "11-24", + "11-27", + "11-30", + "11-32", + "12-title", + "12-01", + "12-03", + "12-06", + "12-08", + "12-11", + "12-14", + "12-16", + "12-19", + "12-20", + "13-title", + "13-01", + "13-03", + "13-05", + "13-07", + "13-09", + "13-11", + "13-13" ] } \ No newline at end of file