From 9be30a00a7ff5f1eed6fe1a8d1a13921f65fffb9 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Sun, 19 Jul 2020 06:26:35 +0300 Subject: [PATCH] Sun Jul 19 2020 06:26:34 GMT+0300 (E. Africa Standard Time) --- 08/03.txt | 6 +----- 08/05.txt | 6 +----- 08/07.txt | 6 +----- 08/09.txt | 6 +----- 08/11.txt | 6 +----- 08/12.txt | 6 +----- manifest.json | 6 ++++++ 7 files changed, 12 insertions(+), 30 deletions(-) diff --git a/08/03.txt b/08/03.txt index 1183588..dc90bea 100644 --- a/08/03.txt +++ b/08/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Seliman hajimu hamath zobah wa intesir le homon \v 4 Huwo abinu tadmor fi sahra, wa kulu mudun al ta makazin al huwo abinu fi hamath. -======= -\v 3 Wa solomon ruwa hajemu Hamat Zobah wa howo intesir. \v 4 Howo abienu Tadmorfi al beriya. wa kulu mudun al ta tekhzin ta akil, al howo abienu fi Hamat ->>>>>>> 020bc6178a6f644bb2ab0d330b113111a0132228 +\v 3 Seliman hajimu hamath zobah wa intesir le homon \v 4 Huwo abinu tadmor fi sahra, wa kulu mudun al ta makazin al huwo abinu fi hamath. \ No newline at end of file diff --git a/08/05.txt b/08/05.txt index 61c3287..0726c19 100644 --- a/08/05.txt +++ b/08/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Wa Kaman huwo abinu beth horon al fok wa beth horon al tehet, mudun al abinu bi suur al gowi, bowaba wa khandak \v 6 Seliman abinu baalath wa kulu mudun ta makazin al tabe le huwo, wa kulu mudun al ta murakabat tou, wa kulu hajat al huwo kan gi itmana ashan bi abinu fi Jerusalem, fi Lebanon, wa fi kulu mahal al tehet hukun tou. -======= -\v 5 Wa kaman howo abienu biet Horon al fok wa biet Horon al tehet, Mudun al gowi maa heta, abuab, wa Andayat. \v 6 Howo abienu biet Baala wa kulu mudun ta makhazin al kan tuo, wa kulu mudun ta Arabat tuo wa Mudun ta Fursan tuo, wa ayi haja al howo deeru abienu fi Urshelim, fi Lobnan, wa fi kulu aradi fi tehet sulta tuo. ->>>>>>> 020bc6178a6f644bb2ab0d330b113111a0132228 +\v 5 Wa Kaman huwo abinu beth horon al fok wa beth horon al tehet, mudun al abinu bi suur al gowi, bowaba wa khandak \v 6 Seliman abinu baalath wa kulu mudun ta makazin al tabe le huwo, wa kulu mudun al ta murakabat tou, wa kulu hajat al huwo kan gi itmana ashan bi abinu fi Jerusalem, fi Lebanon, wa fi kulu mahal al tehet hukun tou. \ No newline at end of file diff --git a/08/07.txt b/08/07.txt index 249eaa7..6f0aa8f 100644 --- a/08/07.txt +++ b/08/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Wa le kulu nas al kan sibu fi hihites, amoriin, perizzitiin, hivitiin wa jebusitiin, al homon ma tabe le Israel, \v 8 Wa nas al min bein tomon al fadulu sibu fi ard dak al nas ta Israel ma demiru homon, seliman amulu homon omal ta shukul, lahadi yom ta alela -======= -\v 7 Wa le shaab kulu al kan fadulu min al Hittiteen, Al Amoreen, al pherizeen, Al Huween, wa Al Yebuseen, al ma tabieen le Israel, \v 8 Ajeayal tomon al fadulu min baad homon fi al ardi, al shaab ta israel kan ma demiru- solomon amulu homon ummal bi gowa, min zaman dak le hasa. ->>>>>>> 020bc6178a6f644bb2ab0d330b113111a0132228 +\v 7 Wa le kulu nas al kan sibu fi hihites, amoriin, perizzitiin, hivitiin wa jebusitiin, al homon ma tabe le Israel, \v 8 Wa nas al min bein tomon al fadulu sibu fi ard dak al nas ta Israel ma demiru homon, seliman amulu homon omal ta shukul, lahadi yom ta alela \ No newline at end of file diff --git a/08/09.txt b/08/09.txt index 5b79e17..a561c6c 100644 --- a/08/09.txt +++ b/08/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Seliman ma amulu iyal ta isreal abiet lakin huwo amulu homon asakir wa musuliin ta jesh wa dubat ta asakir ta murakabat tou \v 10 Wa ruwasa al kan seliman kutu homon ashan bi kun musuliin le nas adad tomon kan 250. -======= -\v 9 Ama, shaab ta Israel howo ma amulu homon ummal ta shukul, Lakin, howo amulu homon Asakiir tuo, ruasaa ta ghuwad, Dubbat, wa ruasaa ta Arabat tuo wa Fursan tuo. \v 10 Wa deel ruasaa ta dubbat ta idara ta muraghaba al khas le melik Somon, miyaatiin -wa khamsiin 250 min homon, al gi raghibu shaab al fi ishtakal. ->>>>>>> 020bc6178a6f644bb2ab0d330b113111a0132228 +\v 9 Seliman ma amulu iyal ta isreal abiet lakin huwo amulu homon asakir wa musuliin ta jesh wa dubat ta asakir ta murakabat tou \v 10 Wa ruwasa al kan seliman kutu homon ashan bi kun musuliin le nas adad tomon kan 250. \ No newline at end of file diff --git a/08/11.txt b/08/11.txt index 68cf989..975a743 100644 --- a/08/11.txt +++ b/08/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Seliman jibu beniya ta pharaoh min medina ta daud le biet al kan huwo abinu le heya, wa huwo kelimu mara tai ma bi geni fi beit ta daud, melik ta Israel, leanu mahal al tabut ta Rabuna dakalu fogo biga mukadus." -======= -\v 11 Solomon jebu Biniya ta Pharaon min Medina ta Daud le Biet al howo abienu le hiya, wa howo kelim gal, "Mara tai ma bi geni fi Biet ta Daud melik ta Israel, ashan ayi makan wosulu fogu howo mughadas." ->>>>>>> 020bc6178a6f644bb2ab0d330b113111a0132228 +\v 11 Seliman jibu beniya ta pharaoh min medina ta daud le biet al kan huwo abinu le heya, wa huwo kelimu mara tai ma bi geni fi beit ta daud, melik ta Israel, leanu mahal al tabut ta Rabuna dakalu fogo biga mukadus." \ No newline at end of file diff --git a/08/12.txt b/08/12.txt index b502e47..5de5529 100644 --- a/08/12.txt +++ b/08/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Biga seliman gedimu zebiha al haragu le Rabuna fi masbaha al huwo abinu gedam ta portico, \v 13 Huwo gedimu zebiha ze ma kulu yom, wa huwo gi gedimu hasab wosiya ta musa, fi ayam ta Sabbath, agmar al jedid, wa fi ayat tala tal marat, kulu sena id al fetiir wa id ta asabe wa is ta mazalat. -======= -\v 12 Biga Solomon wodi tegdima ta zebiha le Yahwah fi mazbaha tuo al howo abienu gedam ta barada. \v 13 Howo gedimu zebiha fi kulu yom hasab talabu; howo gedimu homon, hasab irshadat ta wosiya ta Musa, fi ayam ta sebit, Bidaya ta shahar, wa fi Ihtifalat al talata marat fi kulu sina: fi ead al fetiir, ead al asabiea wa fi ead al Mizalat. ->>>>>>> 020bc6178a6f644bb2ab0d330b113111a0132228 +\v 12 Biga seliman gedimu zebiha al haragu le Rabuna fi masbaha al huwo abinu gedam ta portico, \v 13 Huwo gedimu zebiha ze ma kulu yom, wa huwo gi gedimu hasab wosiya ta musa, fi ayam ta Sabbath, agmar al jedid, wa fi ayat tala tal marat, kulu sena id al fetiir wa id ta asabe wa is ta mazalat. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 896de1d..f8cea1f 100644 --- a/manifest.json +++ b/manifest.json @@ -112,6 +112,12 @@ "07-21", "08-title", "08-01", + "08-03", + "08-05", + "08-07", + "08-09", + "08-11", + "08-12", "08-14", "08-16", "08-17",