diff --git a/04/04.txt b/04/04.txt index 79dfb4a..8111445 100644 --- a/04/04.txt +++ b/04/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 \v 5 Lona diaka. -======= -\v 4 Diaka ke lona! A ga le itse gore botsalano le lefatshe ke bobaba kgatlhanong le Modimo. Jalo ope hela yo o batlang go nna tsala ya lefatshe o itira mmaba wa Modimo. \v 5 Kana le akanya gore dikwalo di bua lefela fa dire, ''Mowa o a o dirileng go tshela mo go rona o lefufa le le tseneletseng''? ->>>>>>> 906264c00d04cd9af302e6dec946c05135560af2 +\v 4 Diaka ke lona! A ga le itse gore botsalano le lefatshe ke bobaba kgatlhanong le Modimo. Jalo ope hela yo o batlang go nna tsala ya lefatshe o itira mmaba wa Modimo. \v 5 Kana le akanya gore dikwalo di bua lefela fa dire, ''Mowa o a o dirileng go tshela mo go rona o lefufa le le tseneletseng''? \ No newline at end of file diff --git a/04/06.txt b/04/06.txt index ba8e6e8..72c2203 100644 --- a/04/06.txt +++ b/04/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 \v 7 Mme Modimo ofa tshegofatso e kgolo, mme dikwalo tsa re, Modimo o ganetsa -======= -\v 6 Mme Modimo o fa ditshegofatso tse dintsi, jalo dikwalo tsare, ''Modimo o ganetsa ba ba boikgokgomoso, mme o neela tshogofatso ba ba boikobo''. \v 7 Jaanong ineeleng mo Modimong. Ganetsang diabolo, mme otla le tshaba. ->>>>>>> 906264c00d04cd9af302e6dec946c05135560af2 +\v 6 Mme Modimo o fa ditshegofatso tse dintsi, jalo dikwalo tsare, ''Modimo o ganetsa ba ba boikgokgomoso, mme o neela tshogofatso ba ba boikobo''. \v 7 Jaanong ineeleng mo Modimong. Ganetsang diabolo, mme otla le tshaba. \ No newline at end of file diff --git a/manifest.json b/manifest.json index d4ea85e..0364556 100644 --- a/manifest.json +++ b/manifest.json @@ -35,7 +35,8 @@ "translators": [ "NAMETSO AGNES MOGAPI", "IKANYENG SEBELE", - "LEKGOTLA CHALE" + "LEKGOTLA CHALE", + "Phil" ], "finished_chunks": [ "front-title", @@ -59,6 +60,13 @@ "03-11", "03-13", "03-15", + "04-title", + "04-01", + "04-04", + "04-08", + "04-11", + "04-13", + "04-15", "05-title", "05-01", "05-04", @@ -67,12 +75,6 @@ "05-12", "05-13", "05-16", - "05-19", - "04-title", - "04-01", - "04-08", - "04-11", - "04-13", - "04-15" + "05-19" ] } \ No newline at end of file