Merge branch 'master' into 'master'

Update 1.md - typo

See merge request dev_urandom/simple-site!3

pages/tokipona/1.md

@@ -6,7 +6,7 @@ The vocabulary for this page:
 
 | word  | meaning                         |
 |-------|---------------------------------|
-| mi    | i, me, us                       |
+| mi    | I, me, us                       |
 | sina  | you                             |
 | ona   | he, she, they, it               |
 | li    | (between subj. and verb/adj.)   |

pages/tokipona/10.md

@@ -167,7 +167,7 @@ And try to translate the following sentences into toki pona.
 > * If you're on a hill, you can see many things.
 
 > %spoiler%
-> * sina sona ala sona pali ona? / sina sona pali ona anu seme?
+> * sina sona ala sona pali e ona? / sina sona pali e ona anu seme?
 > * ale li ken.
 > * sina ken ala ken open e lupa? / sina ken open e lupa anu seme?
 > * sina kute ala e jan sona la pali sina li ike.

pages/tokipona/11.md

@@ -153,8 +153,8 @@ And try to translate the following sentences into toki pona.
 > %spoiler%
 > * mi lon tomo nanpa mute luka tu pi nasin Wasintan.
 > * ilo pi sitelen tawa li toki e ni: tenpo suno kama la suno li lon.
-> * tenpo pimeja la lete li lon.
+> * tenpo pimeja ni la lete li lon.
 > * (tenpo mun / tenpo sike mun) nanpa luka li (pona / suwi).
-> * sina jo e ijo mute pi kalama musi a!
+> * sina jo e ilo mute pi kalama musi a!
 
 [Previous page](10.html) [Top page](index.html) [Next page](12.html)

pages/tokipona/12.md

@@ -43,8 +43,8 @@ But, when added at the beginning of a sentence, it means "but" or "however":
 > explaining certain ideas, or how communities differ in using them.
 
 In the official dictionary, "pu" is only defined as "interacting with the
-official Toki Pona book". Usage of this word as a noun, while common among some
-users, is unofficial. 
+official Toki Pona book". Usage of this word as "the official Toki Pona book"
+itself, while common among some users, is unofficial. 
 
 ## Exercises
 

pages/tokipona/6.md

@@ -94,7 +94,7 @@ And here are some examples of the location words:
 
 > ona li lon monsi sina. -- They are behind you.
 
-> jan utala mute li lon sinpin. -- Warriors are standing in front of me.
+> jan utala mute li lon sinpin mi. -- Warriors are standing in front of me.
 
 > lipu suli li lon sinpin ni. -- An important document is on this wall.
 

pages/tokipona/7.md

@@ -203,7 +203,7 @@ And try to translate the following sentences into toki pona.
 > * mi toki insa e ni: jan sewi li lon ala.
 > * o kalama ala lon tomo lipu.
 > * jan lawa mi li toki e ni: o lape ala lon tomo pali.
-> * jan sama mije sina li lukin sama mute sina.
+> * jan sama mije sina li sama mute lukin sina.
 > * o tawa ala lon ma.
 
 [Previous page](6.html) [Top page](index.html) [Next page](8.html)

pages/tokipona/9.md

@@ -17,7 +17,7 @@ The vocabulary for this page:
 | lete  | cold, raw                        |
 | musi  | entertaining, artistic, fun, game|
 
-Time to introduce two another particles in this language: "pi" and "la".
+Time to introduce two other particles in this language: "pi" and "la".
 
 ## pi
 
@@ -118,8 +118,8 @@ Or be used to link multiple sentences:
 The official book, different online courses and my personal style
 differ on how to place punctuation in sentences that use "la".
 
-The official book sometimes uses a comma before "la" and sometimes uses no
-punctuation.
+The official book uses a comma before "la" when it combines two sentences and uses no
+punctuation otherwise.
 
 The "12 days of sona pi toki pona" video series uses no punctuation in all cases
 (and so did the "o kama sona e toki pona!" course).
@@ -155,7 +155,7 @@ And try to translate the following sentences into toki pona.
 > * In this house, I speak toki pona and English.
 > * If you eat raw meat, it will be bad for your body.
 > * Their music ("entertaining sounds") is very good.
-> * If you misuse ("use badly") the tools, they will break.
+> * If you misuse ("use badly") the tools, they will break ("be broken").
 
 > %spoiler%
 > * sewi li pimeja la o awen lon tomo.