From ae65a19a87384e953e90ea0e7e2d62682be1c961 Mon Sep 17 00:00:00 2001 From: Abelmon Date: Wed, 13 Jul 2022 10:49:38 -0300 Subject: [PATCH] =?UTF-8?q?Wed=20Jul=2013=202022=2010:49:37=20GMT-0300=20(?= =?UTF-8?q?Hor=C3=A1rio=20Padr=C3=A3o=20de=20Bras=C3=ADlia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 04/03.txt | 6 +----- 04/06.txt | 6 +----- 04/09.txt | 6 +----- 04/11.txt | 8 ++------ 04/14.txt | 6 +----- 05/01.txt | 6 +----- 05/03.txt | 6 +----- 05/05.txt | 6 +----- 05/07.txt | 6 +----- 05/09.txt | 6 +----- 05/11.txt | 6 +----- 05/14.txt | 6 +----- 05/17.txt | 6 +----- manifest.json | 5 ++++- 14 files changed, 18 insertions(+), 67 deletions(-) diff --git a/04/03.txt b/04/03.txt index 5a91994..5996c51 100644 --- a/04/03.txt +++ b/04/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -tumãte.\v 3 Ie ka ãpexe ha la maiaz-la ie ka bai lod pu ie pa mãje dji alimẽtasiõ ki bõdje fe pu pataje ke fos ke ghemesi ke mun ki fie-iela i ki konét lavehite . \v 4 Pase tut bagaj ki bõdje ka fe ie bõ.Ãie ki u ka husuve i ki u ka fe u puve dji no, \v 5 Pase i sepahe pu pahol dji bõdje i pu -======= -\v 3 Ie ka ãpexe ha la maiaz-la ie ka bai lod pu ie pa mãje dji alimẽtasiõ ki bõdje fe pu pataje ke fos ke ghemesi ke mun ki fie-iela i ki konét lavehite . \v 4 Pase tut bagaj ki bõdje ka fe ie bõ.Ãie ki u ka husuve i ki u ka fe u puve dji no, \v 5 Pase i sepahe pu pahol dji bõdje i pu phwie. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 3 Ie ka ãpexe ha la maiaz-la ie ka bai lod pu ie pa mãje dji alimẽtasiõ ki bõdje fe pu pataje ke fos ke ghemesi ke mun ki fie-iela i ki konét lavehite . \v 4 Pase tut bagaj ki bõdje ka fe ie bõ.Ãie ki u ka husuve i ki u ka fe u puve dji no, \v 5 Pase i sepahe pu pahol dji bõdje i pu phwie. \ No newline at end of file diff --git a/04/06.txt b/04/06.txt index 34825e5..7c45a00 100644 --- a/04/06.txt +++ b/04/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -phwie.\v 6 Si u mete tut ha bagaj-iela djivã u fwe-iela,u ke sa un bõ sehv dji jezi khi,pase u ke gãiẽ alimẽtasiõ dji pahol dji fie i pu un bõ mõthe ki u swiv. \v 7 Mẽ dji nõ pu ixtwa ki pabõ i dji u phop ko i mun ki vie kaduka.Pase sa, thavai ke kõtã. \v 8 Pase Ezehsis fizik gãiẽ tximoho utxilize,mẽ a kõtã i valé pu tut bagaj i phomes pu u lavi i pu -======= -\v 6 Si u mete tut ha bagaj-iela djivã u fwe-iela,u ke sa un bõ sehv dji jezi khi,pase u ke gãiẽ alimẽtasiõ dji pahol dji fie i pu un bõ mõthe ki u swiv.\v 7 Mẽ dji nõ pu ixtwa ki pabõ i dji u phop ko i mun ki vie kaduka.Pase sa, thavai ke kõtã.\v 8 Pase Ezehsis fizik gãiẽ tximoho utxilize,mẽ a kõtã i valé pu tut bagaj i phomes pu u lavi i pu djivã. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 6 Si u mete tut ha bagaj-iela djivã u fwe-iela,u ke sa un bõ sehv dji jezi khi,pase u ke gãiẽ alimẽtasiõ dji pahol dji fie i pu un bõ mõthe ki u swiv. \v 7 Mẽ dji nõ pu ixtwa ki pabõ i dji u phop ko i mun ki vie kaduka.Pase sa, thavai ke kõtã. \v 8 Pase Ezehsis fizik gãiẽ tximoho utxilize,mẽ a kõtã i valé pu tut bagaj i phomes pu u lavi i pu djivã. \ No newline at end of file diff --git a/04/09.txt b/04/09.txt index e0157d5..a171d2e 100644 --- a/04/09.txt +++ b/04/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -djivã.\v 9 nuvel-la a dji kõfias i dji hespek i tut ki no ka asete. \v 10 Pase apuha no ka fose no ko i no ka thavai buku, pase no gãiẽ kõfias la un bõdje ki viv,ki asauvasiõ dji tut mun-iela,i expesial dji ha ki ka -======= -\v 9Ha nuvel-la a dji kõfias i dji hespek i tut ki no ka asete.\v 10 Pase apuha no ka fose no ko i no ka thavai buku, pase no gãiẽ kõfias la un bõdje ki viv,ki asauvasiõ dji tut mun-iela,i expesial dji ha ki ka khe-iela. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 9 Ha nuvel-la a dji kõfias i dji hespek i tut ki no ka asete. \v 10 Pase apuha no ka fose no ko i no ka thavai buku, pase no gãiẽ kõfias la un bõdje ki viv,ki asauvasiõ dji tut mun-iela,i expesial dji ha ki ka khe-iela. \ No newline at end of file diff --git a/04/11.txt b/04/11.txt index feda92c..6501590 100644 --- a/04/11.txt +++ b/04/11.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -khe-iela.\v 11 koze i mõthe ha bagaj-iela. \v 12 Pa lese pies mun demal hespete u jones,pase sa a un lekzam pu ha ki ka khe,la koze la kõtãtmã i la fie i phop. \v 13 Juk tã mo tonẽ,ãtãsiõ pu li i kõseie i pu -======= -\v 11 koze i mõthe ha bagaj-iela.\v 12 Pa lese pies mun demal hespete u jones,pase sa a un lekzam pu ha ki ka khe,la koze la kõtãtmã i la fie i phop.\v 13 Juk tã mo tonẽ,ãtãsiõ -pu li i kõseie i pu mõthe. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 11 koze i mõthe ha bagaj-iela. \v 12 Pa lese pies mun demal hespete u jones,pase sa a un lekzam pu ha ki ka khe,la koze la kõtãtmã i la fie i phop. \v 13 Juk tã mo tonẽ,ãtãsiõ +pu li i kõseie i pu mõthe. \ No newline at end of file diff --git a/04/14.txt b/04/14.txt index 08f8762..eb9d8a9 100644 --- a/04/14.txt +++ b/04/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -mõthe.\v 14 Pa neglijã ha dõ ki la hu to,ki vinĩ dji ãdjidã pu to i pu djivã ,ke posiõ dji lamẽ dji ãsiẽ-iela. \v 15 Ẽtxupe dji ha bagaj-iela,hete la hwie,pu u fos hete akle pu tut ha mun-iela. \v 16 Ẽtxupe dji to mem i pu mõthe.Kõtxinẽ la ha bagaj-iela pase si u fe sa u ke sove u mem mem i mun ki ka -======= -\v 14 Pa neglijã ha dõ ki la hu to,ki vinĩ dji ãdjidã pu to i pu djivã ,ke posiõ dji lamẽ dji ãsiẽ-iela.\v 15 Ẽtxupe dji ha bagaj-iela,hete la hwie,pu u fos hete akle pu tut ha mun-iela. \v 16 Ẽtxupe dji to mem i pu mõthe.Kõtxinẽ la ha bagaj-iela pase si u fe sa u ke sove u mem mem i mun ki ka tãdeu. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 14 Pa neglijã ha dõ ki la hu to,ki vinĩ dji ãdjidã pu to i pu djivã ,ke posiõ dji lamẽ dji ãsiẽ-iela. \v 15 Ẽtxupe dji ha bagaj-iela,hete la hwie,pu u fos hete akle pu tut ha mun-iela. \v 16 Ẽtxupe dji to mem i pu mõthe.Kõtxinẽ la ha bagaj-iela pase si u fe sa u ke sove u mem mem i mun ki ka tãdeu. \ No newline at end of file diff --git a/05/01.txt b/05/01.txt index 74aedfe..9348576 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Pa koze mal ke ha ghamun-la,me kõseiél ãke um papa.koze jis ke ha wom ki jon-iela ãke un fwe \v 2 .koze jis ke ha fam ghamun-iela ãke un mamã,i ha ki pi jon -iela ãke un so,ke tut -======= -\v 1 Pa koze mal ke ha ghamun-la,me kõseiél ãke um papa.koze jis ke ha wom ki jon-iela ãke un fwe \v 2 .koze jis ke ha fam ghamun-iela ãke un mamã,i ha ki pi jon -iela ãke un so,ke tut klehite. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\c 5 \v 1 Pa koze mal ke ha ghamun-la,me kõseiél ãke um papa.koze jis ke ha wom ki jon-iela ãke un fwe \v 2 .koze jis ke ha fam ghamun-iela ãke un mamã,i ha ki pi jon -iela ãke un so,ke tut klehite. \ No newline at end of file diff --git a/05/03.txt b/05/03.txt index 190bffc..3e4d509 100644 --- a/05/03.txt +++ b/05/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -klehite.\v 3 vãte ha fam ki pa gãiẽ wom-iela dji lavehite; \v 4 Ẽbe,si un fam ki pa gãiẽ wom,gãiẽ pitxit,paru,lese ki ie phomiẽ ãphan mõthe vãte la u phóp kaz.Lese ki i mõthe pu ie papa,ẽbe i ka fe bõdje -======= -\v 3 vãte ha fam ki pa gãiẽ wom-iela dji lavehite; \v 4 Ẽbe,si un fam ki pa gãiẽ wom,gãiẽ pitxit,paru,lese ki ie phomiẽ ãphan mõthe vãte la u phóp kaz.Lese ki i mõthe pu ie papa,ẽbe i ka fe bõdje kõtã. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 3 vãte ha fam ki pa gãiẽ wom-iela dji lavehite; \v 4 Ẽbe,si un fam ki pa gãiẽ wom,gãiẽ pitxit,paru,lese ki ie phomiẽ ãphan mõthe vãte la u phóp kaz.Lese ki i mõthe pu ie papa,ẽbe i ka fe bõdje kõtã. \ No newline at end of file diff --git a/05/05.txt b/05/05.txt index 7e923da..ffbe21f 100644 --- a/05/05.txt +++ b/05/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -kõtã.\v 5 Mẽ,un fam ki pa gãiẽ wom dji lavehite ala ki ila linso mem.I ka mete ho kõfiãs la bõdje i kõtxinẽ dumãde phwie nanwit i lajonẽ. \v 6 Ẽbe,ha fam ki ka viv lãdã ie plezi ie muhi mem ki ie -======= -\v 5 Mẽ,un fam ki pa gãiẽ wom dji lavehite ala ki ila linso mem.I ka mete ho kõfiãs la bõdje i kõtxinẽ dumãde phwie nanwit i lajonẽ. \v 6 Ẽbe,ha fam ki ka viv lãdã ie plezi ie muhi mem ki ie viv. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 5 Mẽ,un fam ki pa gãiẽ wom dji lavehite ala ki ila linso mem.I ka mete ho kõfiãs la bõdje i kõtxinẽ dumãde phwie nanwit i lajonẽ. \v 6 Ẽbe,ha fam ki ka viv lãdã ie plezi ie muhi mem ki ie viv. \ No newline at end of file diff --git a/05/07.txt b/05/07.txt index c948ecf..7aa9169 100644 --- a/05/07.txt +++ b/05/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -viv.\v 7 Pale ha bagaj -iela pu ie puve jis. \v 8 Mẽ si piés mun pa ẽtxupe dji ho phóp kamahad, ixpesial dji ho phóp kaz,i lese ho fie mem i pi mal dji ki um mun ki pa sa -======= -\v 7 Pale ha bagaj -iela pu ie puve jis.\v 8 Mẽ si piés mun pa ẽtxupe dji ho phóp kamahad, ixpesial dji ho phóp kaz,i lese ho fie mem i pi mal dji ki um mun ki pa sa khetxẽ. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 7 Pale ha bagaj -iela pu ie puve jis. \v 8 Mẽ si piés mun pa ẽtxupe dji ho phóp kamahad, ixpesial dji ho phóp kaz,i lese ho fie mem i pi mal dji ki um mun ki pa sa khetxẽ. \ No newline at end of file diff --git a/05/09.txt b/05/09.txt index 912a561..a378b7c 100644 --- a/05/09.txt +++ b/05/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -khetxẽ.\v 9 ki um fam ki pa gãiẽ wom ka helasionẽ ãke um fam ki pa gãiẽ wom. \v 10 I djivét konét um bõ thavai,i gãiẽ dji ẽtxupe dji ho pitxit-iela,i gãiẽ pu husuve mun ki ẽthãj-iela,i lave pie dji sẽ iela,i kalmẽ mun ki pa gãie paxãs,ki ka dedjike hoko la um bõ -======= -\v 9 ki um fam ki pa gãiẽ wom ka helasionẽ ãke um fam ki pa gãiẽ wom.\v 10 I djivét konét um bõ thavai,i gãiẽ dji ẽtxupe dji ho pitxit-iela,i gãiẽ pu husuve mun ki ẽthãj-iela,i lave pie dji sẽ iela,i kalmẽ mun ki pa gãie paxãs,ki ka dedjike hoko la um bõ thavai. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 9 ki um fam ki pa gãiẽ wom ka helasionẽ ãke um fam ki pa gãiẽ wom. \v 10 I djivét konét um bõ thavai,i gãiẽ dji ẽtxupe dji ho pitxit-iela,i gãiẽ pu husuve mun ki ẽthãj-iela,i lave pie dji sẽ iela,i kalmẽ mun ki pa gãie paxãs,ki ka dedjike hoko la um bõ thavai. \ No newline at end of file diff --git a/05/11.txt b/05/11.txt index 28568ba..c38f92d 100644 --- a/05/11.txt +++ b/05/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -thavai.\v 11 mẽ kõbiẽ jon fam ki pa gãiẽ wom-iela ie pole helasionẽ la list-la;kã,u ka hãde plezi dji u ko kõt plezi dji Jezi u le maie. \v 12 Dji ha mãiẽ-la u ka hete jenẽ pu txue haki u te phomét ãvã. \v 13 I to abitue hete sã fe ãiẽ,maxe dji kaz pu kaz.A pa selmã pa fe ãiẽ,mẽ ika tonẽ um mun ki save fe mãtõ i ka gade lavi dji mun,koze bagaj ki u pa djivét -======= -\v 11 mẽ kõbiẽ jon fam ki pa gãiẽ wom-iela ie pole helasionẽ la list-la;kã,u ka hãde plezi dji u ko kõt plezi dji Jezi u le maie.\v 12 Dji ha mãiẽ-la u ka hete jenẽ pu txue haki u te phomét ãvã.\v 13 I to abitue hete sã fe ãiẽ,maxe dji kaz pu kaz.A pa selmã pa fe ãiẽ,mẽ ika tonẽ um mun ki save fe mãtõ i ka gade lavi dji mun,koze bagaj ki u pa djivét koze. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 11 mẽ kõbiẽ jon fam ki pa gãiẽ wom-iela ie pole helasionẽ la list-la;kã,u ka hãde plezi dji u ko kõt plezi dji Jezi u le maie. \v 12 Dji ha mãiẽ-la u ka hete jenẽ pu txue haki u te phomét ãvã. \v 13 I to abitue hete sã fe ãiẽ,maxe dji kaz pu kaz.A pa selmã pa fe ãiẽ,mẽ ika tonẽ um mun ki save fe mãtõ i ka gade lavi dji mun,koze bagaj ki u pa djivét koze. \ No newline at end of file diff --git a/05/14.txt b/05/14.txt index 0f7eaa5..185ea03 100644 --- a/05/14.txt +++ b/05/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -koze.\v 14 A Kõhã,mole ki ha jon mun-iela maie pu ie fe pitxit i kũdji un kaz;a kõhã ie pa ke bai plas pu élmi-la mete to lahuto dji fe mal. \v 15 Mẽ de thoa deha sutxi,dezem adjiab. \v 16 Si un un fam khetxẽ gãiẽ,fam ki pa gãiẽ wom lãdã ho lafamĩ,ki ie ka idél, pu legliz la pa hete to xaje pu i puve ide ha fam ki pa gãiẽ -======= -\v 14 A Kõhã,mole ki ha jon mun-iela maie pu ie fe pitxit i kũdji un kaz;a kõhã ie pa ke bai plas pu élmi-la mete to lahuto dji fe mal.\v 15 Mẽ de thoa deha sutxi,dezem adjiab.\v 16 Si un un fam khetxẽ gãiẽ,fam ki pa gãiẽ wom lãdã ho lafamĩ,ki ie ka idél, pu legliz la pa hete to xaje pu i puve ide ha fam ki pa gãiẽ wom-iela. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 14 A Kõhã,mole ki ha jon mun-iela maie pu ie fe pitxit i kũdji un kaz;a kõhã ie pa ke bai plas pu élmi-la mete to lahuto dji fe mal. \v 15 Mẽ de thoa deha sutxi,dezem adjiab. \v 16 Si un un fam khetxẽ gãiẽ,fam ki pa gãiẽ wom lãdã ho lafamĩ,ki ie ka idél, pu legliz la pa hete to xaje pu i puve ide ha fam ki pa gãiẽ wom-iela. \ No newline at end of file diff --git a/05/17.txt b/05/17.txt index d942c7a..1f91845 100644 --- a/05/17.txt +++ b/05/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -wom-iela.\v 17 Ha prexbit ki ka kumãde biẽ-iela ie djivét kõsidehe ke hespék defwe ãplis i kõtã,ixpesial laki ki ka thavai ke pahól i mõthe. \v 18 mẽ ixkritur-la kadji; u pa puve mahe bux dji bef-la kã i ka dethi ghen thig-la,thavaio la mehite husuve ho lajã. -======= -\v 17 Ha prexbit ki ka kumãde biẽ-iela ie djivét kõsidehe ke hespék defwe ãplis i kõtã,ixpesial laki ki ka thavai ke pahól i mõthe. \v 18 mẽ ixkritur-la kadji; u pa puve mahe bux dji bef-la kã i ka dethi ghen thig-la,thavaio la mehite husuve ho lajã. ->>>>>>> ff5b35bb365d29cda1fcc0a7de429a90a0ac466d +\v 17 Ha prexbit ki ka kumãde biẽ-iela ie djivét kõsidehe ke hespék defwe ãplis i kõtã,ixpesial laki ki ka thavai ke pahól i mõthe. \v 18 mẽ ixkritur-la kadji; u pa puve mahe bux dji bef-la kã i ka dethi ghen thig-la,thavaio la mehite husuve ho lajã. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4be7c66..0156e60 100644 --- a/manifest.json +++ b/manifest.json @@ -58,6 +58,9 @@ "03-11", "03-14", "03-16", - "04-01" + "04-01", + "04-03", + "04-06", + "04-09" ] } \ No newline at end of file