Mon Dec 30 2019 16:17:42 GMT+0200 (South Africa Standard Time)

This commit is contained in:
Bshop2 2019-12-30 16:17:42 +02:00
parent c5b5830e51
commit 49eb5ced8b
4 changed files with 13 additions and 27 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 1 \v 1 \v 2 \v 3 Ili ni vumbuluso la Yesu Kristu lamene Mulungu anamupasa kuti aonese akapolo ake zamene zizacitika manje-manje. Anazionesa kupitira mwa mngelo wake kwa Yohane. Yohane anacitira umboni mau a Mulungu na pa umboni operekedwa wa Yesu Khristu, zinthu zonse zamene anaona. Ni odala amene abelenga mokweza, na amene amvera mau ya uneneri, na bamene bagonjera zamene zinalembedwamo, cifukwa nthawi ili pafupi.
=======
\c 1 \v 1 \v 3 Ichi ni chivumbuluso cha Yesu Klistu chamene Mulungu anamu pasa kuti alangize bantchito bake vintu vamene vifunika kuchitika kosa taya ntawi. Anazibisa ichi chintu muku tuma mungelo wake kuli wantchito wake Yohane. \v 2 Yohane anapeleka umboni pa mau ya Mulungu na umboni
>>>>>>> 1dadec7d9b0a000d2dba1dd240dc74f95bb143b5
\c 1 \v 1 \v 3 Ichi ni chivumbuluso cha Yesu Klistu chamene Mulungu anamu pasa kuti alangize bantchito bake vintu vamene vifunika kuchitika kosa taya ntawi. Anazibisa ichi chintu muku tuma mungelo wake kuli wantchito wake Yohane. \v 2 Yohane anapeleka umboni pa mau ya Mulungu na umboni

View File

@ -1,9 +1 @@
<<<<<<< HEAD
<<<<<<< HEAD
Ici nichivumbuluso cha yesu kristu ana mupasa kulangiza apuzisi ake ndipo chizachitika manje manje .
=======
Mutu 1
>>>>>>> e420be4f253cdc4b36bad4180b49a52aeb350723
=======
Mutu 1
>>>>>>> 1dadec7d9b0a000d2dba1dd240dc74f95bb143b5
Mutu 1

View File

@ -1,5 +1 @@
<<<<<<< HEAD
Chibvumbuluso
=======
Chivumbuluso
>>>>>>> 1dadec7d9b0a000d2dba1dd240dc74f95bb143b5
Chivumbuluso

View File

@ -3,7 +3,7 @@
"format": "usfm",
"generator": {
"name": "ts-desktop",
"build": "148"
"build": "2"
},
"target_language": {
"id": "nya-x-nyanja",
@ -27,8 +27,8 @@
"language_id": "en",
"resource_id": "ulb",
"checking_level": "3",
"date_modified": 20170329,
"version": "9"
"date_modified": "2017-11-29T00:00:00+00:00",
"version": "12"
}
],
"parent_draft": {},
@ -42,6 +42,13 @@
"Timothy Muzgatama"
],
"finished_chunks": [
"front-title",
"01-title",
"10-01",
"10-03",
"10-05",
"10-08",
"10-10",
"11-title",
"11-03",
"11-06",
@ -52,11 +59,6 @@
"11-16",
"11-18",
"11-19",
"10-01",
"10-03",
"10-05",
"10-08",
"10-10",
"17-title"
]
}