jessy_brown
/
tn_jas_text_reg
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Sat Mar 11 2017 09:41:58 GMT-0500 (Eastern Standard Time)

This commit is contained in:
tsDesktop 2017-03-11 09:41:58 -05:00
parent 97954482f7
commit a0d43be6a8
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
04/04.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD \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''?
\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

6
04/06.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD \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.
\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

18
manifest.json
View File

@ -35,7 +35,8 @@
"translators": [ "translators": [
"NAMETSO AGNES MOGAPI", "NAMETSO AGNES MOGAPI",
"IKANYENG SEBELE", "IKANYENG SEBELE",
"LEKGOTLA CHALE" "LEKGOTLA CHALE",
"Phil"
], ],
"finished_chunks": [ "finished_chunks": [
"front-title", "front-title",
@ -59,6 +60,13 @@
"03-11", "03-11",
"03-13", "03-13",
"03-15", "03-15",
"04-title",
"04-01",
"04-04",
"04-08",
"04-11",
"04-13",
"04-15",
"05-title", "05-title",
"05-01", "05-01",
"05-04", "05-04",
@ -67,12 +75,6 @@
"05-12", "05-12",
"05-13", "05-13",
"05-16", "05-16",
"05-19", "05-19"
"04-title",
"04-01",
"04-08",
"04-11",
"04-13",
"04-15"
] ]
} }